svn commit: r1630059 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Author: markt
Date: Wed Oct 8 10:13:20 2014
New Revision: 1630059
URL: http://svn.apache.org/r1630059
Log:
FindBugs. Remove unnecessary null check.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1630059r1=1630058r2=1630059view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Oct 8
10:13:20 2014
@@ -442,12 +442,10 @@ public class WebappLoader extends Lifecy
servletContext.removeAttribute(Globals.CLASS_PATH_ATTR);
// Throw away our current class loader
-if (classLoader != null) {
-try {
-classLoader.stop();
-} finally {
-classLoader.destroy();
-}
+try {
+classLoader.stop();
+} finally {
+classLoader.destroy();
}
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630060 - /tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
Author: markt
Date: Wed Oct 8 10:20:20 2014
New Revision: 1630060
URL: http://svn.apache.org/r1630060
Log:
FindBugs. Use a better test for an odd number. Functionally makes no difference
since length is always =0 but it should be a little faster.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java?rev=1630060r1=1630059r2=1630060view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java Wed Oct 8
10:20:20 2014
@@ -97,7 +97,7 @@ public final class HexUtils {
return null;
}
-if (input.length() % 2 == 1) {
+if ((input.length() 1) == 1) {
// Odd number of characters
throw new
IllegalArgumentException(sm.getString(hexUtils.fromHex.oddDigits));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630063 - in /tomcat/trunk: res/findbugs/filter-false-positives.xml test/org/apache/tomcat/util/http/TestCookieParsing.java
Author: markt
Date: Wed Oct 8 10:26:37 2014
New Revision: 1630063
URL: http://svn.apache.org/r1630063
Log:
FindBugs. Ignore a false positive. Add a warning to the code in case someone
copies this test code for a real app.
Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1630063r1=1630062r2=1630063view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Wed Oct 8 10:26:37
2014
@@ -525,6 +525,7 @@
Bug code=RCN /
/Match
+
!-- Test code --
Match
!-- Code is deliberately unused --
@@ -670,6 +671,11 @@
Bug code=ST /
/Match
Match
+Class
name=org.apache.tomcat.util.http.TestCookieParsing$EchoCookieHeader/
+Method name=service/
+Bug pattern=XSS_REQUEST_PARAMETER_TO_SERVLET_WRITER/
+ /Match
+ Match
!-- Return value of latch is intentionally ignored --
Or
Class name=org.apache.tomcat.websocket.TestWebSocketFrameClient/
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java?rev=1630063r1=1630062r2=1630063view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java Wed
Oct 8 10:26:37 2014
@@ -322,6 +322,7 @@ public class TestCookieParsing extends T
protected void service(HttpServletRequest req, HttpServletResponse
resp)
throws ServletException, IOException {
req.getCookies();
+// Never do this in production code. It triggers an XSS.
resp.getWriter().write(req.getHeader(Cookie));
resp.flushBuffer();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/308 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1626894 Blamelist: Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630065 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/ webapps/docs/
Author: markt
Date: Wed Oct 8 10:38:33 2014
New Revision: 1630065
URL: http://svn.apache.org/r1630065
Log:
Extend support for permessage-deflate to the WebSocket client implementation.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1630065r1=1630064r2=1630065view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Oct 8
10:38:33 2014
@@ -61,6 +61,8 @@ public class Constants {
WS_PROTOCOL_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final String WS_EXTENSIONS_HEADER_NAME =
Sec-WebSocket-Extensions;
+public static final Object WS_EXTENSIONS_HEADER_NAME_LOWER =
+WS_EXTENSIONS_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final boolean STRICT_SPEC_COMPLIANCE =
Boolean.getBoolean(
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1630065r1=1630064r2=1630065view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Wed
Oct 8 10:38:33 2014
@@ -48,6 +48,7 @@ public class PerMessageDeflate implement
private final int serverMaxWindowBits;
private final boolean clientContextTakeover;
private final int clientMaxWindowBits;
+private final boolean isServer;
private final Inflater inflater = new Inflater(true);
private final ByteBuffer readBuffer =
ByteBuffer.allocate(Constants.DEFAULT_BUFFER_SIZE);
private final Deflater deflater = new
Deflater(Deflater.DEFAULT_COMPRESSION, true);
@@ -58,8 +59,8 @@ public class PerMessageDeflate implement
private volatile ByteBuffer writeBuffer =
ByteBuffer.allocate(Constants.DEFAULT_BUFFER_SIZE);
private volatile boolean firstCompressedFrameWritten = false;
-static PerMessageDeflate negotiate(ListListParameter preferences) {
-// Accept the first preference that the server is able to support
+static PerMessageDeflate negotiate(ListListParameter preferences,
boolean isServer) {
+// Accept the first preference that the endpoint is able to support
for (ListParameter preference : preferences) {
boolean ok = true;
boolean serverContextTakeover = true;
@@ -142,7 +143,7 @@ public class PerMessageDeflate implement
}
if (ok) {
return new PerMessageDeflate(serverContextTakeover,
serverMaxWindowBits,
-clientContextTakeover, clientMaxWindowBits);
+clientContextTakeover, clientMaxWindowBits, isServer);
}
}
// Failed to negotiate agreeable terms
@@ -151,11 +152,12 @@ public class PerMessageDeflate implement
private PerMessageDeflate(boolean serverContextTakeover, int
serverMaxWindowBits,
-boolean clientContextTakeover, int clientMaxWindowBits) {
+boolean clientContextTakeover, int clientMaxWindowBits, boolean
isServer) {
this.serverContextTakeover = serverContextTakeover;
this.serverMaxWindowBits = serverMaxWindowBits;
this.clientContextTakeover = clientContextTakeover;
this.clientMaxWindowBits = clientMaxWindowBits;
+this.isServer = isServer;
}
@@ -211,7 +213,8 @@ public class PerMessageDeflate implement
}
}
} else if (written == 0) {
-if (fin !serverContextTakeover) {
+if (fin (isServer !serverContextTakeover ||
+!isServer !clientContextTakeover)) {
inflater.reset();
}
return TransformationResult.END_OF_FRAME;
@@ -423,11 +426,12 @@ public class PerMessageDeflate implement
private void startNewMessage() {
firstCompressedFrameWritten = false;
-if (!clientContextTakeover) {
+if (isServer !clientContextTakeover || !isServer
Re: svn commit: r1630065 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/ webapps/docs/
Hi,
On Wed, Oct 8, 2014 at 12:38 PM, ma...@apache.org wrote:
Author: markt
Date: Wed Oct 8 10:38:33 2014
New Revision: 1630065
URL: http://svn.apache.org/r1630065
Log:
Extend support for permessage-deflate to the WebSocket client
implementation.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1630065r1=1630064r2=1630065view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Oct
8 10:38:33 2014
@@ -61,6 +61,8 @@ public class Constants {
WS_PROTOCOL_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final String WS_EXTENSIONS_HEADER_NAME =
Sec-WebSocket-Extensions;
+public static final Object WS_EXTENSIONS_HEADER_NAME_LOWER =
Why the type is Object ?
It is enough for the single use later in Map#get() but someone else may
need it as a String later ?
+WS_EXTENSIONS_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final boolean STRICT_SPEC_COMPLIANCE =
Boolean.getBoolean(
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1630065r1=1630064r2=1630065view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Wed Oct 8 10:38:33 2014
@@ -48,6 +48,7 @@ public class PerMessageDeflate implement
private final int serverMaxWindowBits;
private final boolean clientContextTakeover;
private final int clientMaxWindowBits;
+private final boolean isServer;
private final Inflater inflater = new Inflater(true);
private final ByteBuffer readBuffer =
ByteBuffer.allocate(Constants.DEFAULT_BUFFER_SIZE);
private final Deflater deflater = new
Deflater(Deflater.DEFAULT_COMPRESSION, true);
@@ -58,8 +59,8 @@ public class PerMessageDeflate implement
private volatile ByteBuffer writeBuffer =
ByteBuffer.allocate(Constants.DEFAULT_BUFFER_SIZE);
private volatile boolean firstCompressedFrameWritten = false;
-static PerMessageDeflate negotiate(ListListParameter preferences)
{
-// Accept the first preference that the server is able to support
+static PerMessageDeflate negotiate(ListListParameter preferences,
boolean isServer) {
+// Accept the first preference that the endpoint is able to
support
for (ListParameter preference : preferences) {
boolean ok = true;
boolean serverContextTakeover = true;
@@ -142,7 +143,7 @@ public class PerMessageDeflate implement
}
if (ok) {
return new PerMessageDeflate(serverContextTakeover,
serverMaxWindowBits,
-clientContextTakeover, clientMaxWindowBits);
+clientContextTakeover, clientMaxWindowBits,
isServer);
}
}
// Failed to negotiate agreeable terms
@@ -151,11 +152,12 @@ public class PerMessageDeflate implement
private PerMessageDeflate(boolean serverContextTakeover, int
serverMaxWindowBits,
-boolean clientContextTakeover, int clientMaxWindowBits) {
+boolean clientContextTakeover, int clientMaxWindowBits,
boolean isServer) {
this.serverContextTakeover = serverContextTakeover;
this.serverMaxWindowBits = serverMaxWindowBits;
this.clientContextTakeover = clientContextTakeover;
this.clientMaxWindowBits = clientMaxWindowBits;
+this.isServer = isServer;
}
@@ -211,7 +213,8 @@ public class PerMessageDeflate implement
}
}
} else if (written == 0) {
-if (fin !serverContextTakeover) {
+if (fin (isServer !serverContextTakeover ||
+!isServer !clientContextTakeover)) {
inflater.reset();
}
return
Re: svn commit: r1630065 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/ webapps/docs/
On 08/10/2014 11:41, Martin Grigorov wrote:
It really helps if you are going to comment on a small part of a large
commit if you trim the irrelevant parts of the original in your reply.
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1630065r1=1630064r2=1630065view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Oct
8 10:38:33 2014
@@ -61,6 +61,8 @@ public class Constants {
WS_PROTOCOL_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final String WS_EXTENSIONS_HEADER_NAME =
Sec-WebSocket-Extensions;
+public static final Object WS_EXTENSIONS_HEADER_NAME_LOWER =
Why the type is Object ?
Because I got the IDE to generate the code and didn't notice it created
a String. I'll get that fixed.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1630065 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/ webapps/docs/
On Wed, Oct 8, 2014 at 1:02 PM, Mark Thomas ma...@apache.org wrote:
On 08/10/2014 11:41, Martin Grigorov wrote:
It really helps if you are going to comment on a small part of a large
commit if you trim the irrelevant parts of the original in your reply.
I'll try to remember for the next time.
In my mail client it is a matter of a single click to see what is before or
after such inline comment, so I thought it is easy for others too.
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1630065r1=1630064r2=1630065view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Oct
8 10:38:33 2014
@@ -61,6 +61,8 @@ public class Constants {
WS_PROTOCOL_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final String WS_EXTENSIONS_HEADER_NAME =
Sec-WebSocket-Extensions;
+public static final Object WS_EXTENSIONS_HEADER_NAME_LOWER =
Why the type is Object ?
Because I got the IDE to generate the code and didn't notice it created
a String. I'll get that fixed.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 6.0.42
2014-10-01 0:48 GMT+04:00 jean-frederic clere jfcl...@gmail.com: The proposed Apache Tomcat 6.0.42 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.42/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1023/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_42/ The proposed 6.0.42 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 6.0.42 Stable Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630088 - /tomcat/trunk/build.xml
Author: markt
Date: Wed Oct 8 12:45:40 2014
New Revision: 1630088
URL: http://svn.apache.org/r1630088
Log:
Use 24 hour clock in build stamp
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1630088r1=1630087r2=1630088view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Oct 8 12:45:40 2014
@@ -227,7 +227,7 @@
format property=year pattern= locale=en/
format property=today pattern=MMM d locale=en/
format property=today-iso-8601 pattern=-MM-dd locale=en/
-format property=tstamp pattern=hh:mm:ss/
+format property=tstamp pattern=HH:mm:ss/
/tstamp
filterset id=version.filters
filter token=YEAR value=${year}/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1630088 - /tomcat/trunk/build.xml
2014-10-08 16:45 GMT+04:00 ma...@apache.org:
Author: markt
Date: Wed Oct 8 12:45:40 2014
New Revision: 1630088
URL: http://svn.apache.org/r1630088
Log:
Use 24 hour clock in build stamp
Good catch!
Maybe add timezone information as well?
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1630088r1=1630087r2=1630088view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Oct 8 12:45:40 2014
@@ -227,7 +227,7 @@
format property=year pattern= locale=en/
format property=today pattern=MMM d locale=en/
format property=today-iso-8601 pattern=-MM-dd locale=en/
-format property=tstamp pattern=hh:mm:ss/
+format property=tstamp pattern=HH:mm:ss/
/tstamp
filterset id=version.filters
filter token=YEAR value=${year}/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630092 - /tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
Author: markt
Date: Wed Oct 8 12:56:42 2014
New Revision: 1630092
URL: http://svn.apache.org/r1630092
Log:
Correct type as spotted by Martin Grigorov
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1630092r1=1630091r2=1630092view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Oct 8
12:56:42 2014
@@ -61,7 +61,7 @@ public class Constants {
WS_PROTOCOL_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final String WS_EXTENSIONS_HEADER_NAME =
Sec-WebSocket-Extensions;
-public static final Object WS_EXTENSIONS_HEADER_NAME_LOWER =
+public static final String WS_EXTENSIONS_HEADER_NAME_LOWER =
WS_EXTENSIONS_HEADER_NAME.toLowerCase(Locale.ENGLISH);
public static final boolean STRICT_SPEC_COMPLIANCE =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630094 - /tomcat/trunk/build.xml
Author: markt
Date: Wed Oct 8 13:06:56 2014
New Revision: 1630094
URL: http://svn.apache.org/r1630094
Log:
Ensure all dates are generated for UTC and add timezone to build stamp
Suggested by kkolinko
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1630094r1=1630093r2=1630094view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Oct 8 13:06:56 2014
@@ -224,10 +224,10 @@
!-- Version info filter set --
tstamp
-format property=year pattern= locale=en/
-format property=today pattern=MMM d locale=en/
-format property=today-iso-8601 pattern=-MM-dd locale=en/
-format property=tstamp pattern=HH:mm:ss/
+ format property=year pattern= locale=en timezone=UTC/
+format property=today pattern=MMM d locale=en timezone=UTC/
+format property=today-iso-8601 pattern=-MM-dd locale=en
timezone=UTC/
+format property=tstamp pattern=HH:mm:ss locale=en timezone=UTC/
/tstamp
filterset id=version.filters
filter token=YEAR value=${year}/
@@ -235,7 +235,7 @@
filter token=VERSION_NUMBER value=${version.number}/
filter token=VERSION_MAJOR value=${version.major}/
filter token=VERSION_MAJOR_MINOR value=${version.major.minor}/
-filter token=VERSION_BUILT value=${today} ${tstamp}/
+filter token=VERSION_BUILT value=${today} ${tstamp} UTC/
filter token=JDT_VERSION value=${jdt.version}/
/filterset
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1630088 - /tomcat/trunk/build.xml
On 08/10/2014 13:50, Konstantin Kolinko wrote:
2014-10-08 16:45 GMT+04:00 ma...@apache.org:
Author: markt
Date: Wed Oct 8 12:45:40 2014
New Revision: 1630088
URL: http://svn.apache.org/r1630088
Log:
Use 24 hour clock in build stamp
Good catch!
Maybe add timezone information as well?
Good idea.
I made sure we used UTC everywhere otherwise you could get strange
results if the timezone moved you to the next/previous day compared to UTC.
Mark
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1630088r1=1630087r2=1630088view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Oct 8 12:45:40 2014
@@ -227,7 +227,7 @@
format property=year pattern= locale=en/
format property=today pattern=MMM d locale=en/
format property=today-iso-8601 pattern=-MM-dd locale=en/
-format property=tstamp pattern=hh:mm:ss/
+format property=tstamp pattern=HH:mm:ss/
/tstamp
filterset id=version.filters
filter token=YEAR value=${year}/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/523 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1630059 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630110 - in /tomcat/trunk: java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/VersionLoggerListener.java webapps/docs/changelog.xml webapps/docs/co
Author: markt
Date: Wed Oct 8 14:05:22 2014
New Revision: 1630110
URL: http://svn.apache.org/r1630110
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47919
Extend the information logged when Tomcat starts to optionally include (enabled
by default) the values of key environment variables.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1630110r1=1630109r2=1630110view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Wed
Oct 8 14:05:22 2014
@@ -121,12 +121,22 @@ userConfig.error=Error deploying web app
userConfig.start=UserConfig: Processing START
userConfig.stop=UserConfig: Processing STOP
userConfig.deploy.threaded.error=Error waiting for multi-thread deployment of
user directories to complete
-versionLoggerListener.serverInfo.server.version=Server version: {0}
-versionLoggerListener.serverInfo.server.built =Server built: {0}
-versionLoggerListener.serverInfo.server.number =Server number: {0}
-versionLoggerListener.serverInfo.os.name =OS Name:{0}
-versionLoggerListener.serverInfo.os.version=OS Version: {0}
-versionLoggerListener.serverInfo.os.arch =Architecture: {0}
-versionLoggerListener.serverInfo.vm.version=JVM Version:{0}
-versionLoggerListener.serverInfo.vm.vendor =JVM Vendor: {0}
+versionLoggerListener.serverInfo.server.version=Server version: {0}
+versionLoggerListener.serverInfo.server.built =Server built: {0}
+versionLoggerListener.serverInfo.server.number =Server number: {0}
+versionLoggerListener.serverInfo.os.name =OS Name:{0}
+versionLoggerListener.serverInfo.os.version=OS Version: {0}
+versionLoggerListener.serverInfo.os.arch =Architecture: {0}
+versionLoggerListener.serverInfo.vm.version=JVM Version:{0}
+versionLoggerListener.serverInfo.vm.vendor =JVM Vendor: {0}
+versionLoggerListener.env.catalina.base=CATALINA_BASE: {0}
+versionLoggerListener.env.catalina.home=CATALINA_HOME: {0}
+versionLoggerListener.env.catalina.tmpdir =CATALINA_TMPDIR:{0}
+versionLoggerListener.env.java.home=JAVA_HOME: {0}
+versionLoggerListener.env.jre.home =JRE_HOME: {0}
+versionLoggerListener.env.runjava =_RUNJAVA: {0}
+versionLoggerListener.env.java.opts=JAVA_OPTS: {0}
+versionLoggerListener.env.catalina.opts=CATALINA_OPTS: {0}
+versionLoggerListener.env.java.endorsed=JAVA_ENDORSED_DIRS: {0}
+versionLoggerListener.env.classpath=CLASSPATH {0}
webAnnotationSet.invalidInjection=Invalid method resource injection annotation.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java?rev=1630110r1=1630109r2=1630110view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
Wed Oct 8 14:05:22 2014
@@ -37,6 +37,19 @@ public class VersionLoggerListener imple
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+private boolean logEnv = true;
+
+
+public boolean getLogEnv() {
+return logEnv;
+}
+
+
+public void setLogEnv(boolean logEnv) {
+this.logEnv = logEnv;
+}
+
+
@Override
public void lifecycleEvent(LifecycleEvent event) {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
@@ -62,5 +75,28 @@ public class VersionLoggerListener imple
System.getProperty(java.runtime.version)));
log.info(sm.getString(versionLoggerListener.serverInfo.vm.vendor,
System.getProperty(java.vm.vendor)));
+
+if (logEnv) {
+log.info(sm.getString(versionLoggerListener.env.catalina.base,
+System.getenv(CATALINA_BASE)));
+log.info(sm.getString(versionLoggerListener.env.catalina.home,
+System.getenv(CATALINA_HOME)));
+log.info(sm.getString(versionLoggerListener.env.catalina.tmpdir,
+System.getenv(CATALINA_TMPDIR)));
+
[Bug 47919] Log Tomcat Java environment variables in addition to echoing to the screen
https://issues.apache.org/bugzilla/show_bug.cgi?id=47919 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- The recently added VersionLoggerListener has been extended to optionally include these environment variables. This feature is enabled by default. This change has been applied to 8.0.x for 8.0.15 onwards. I do not intend to propose this for backport to 7.0.x or 6.0.x. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 33 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141008.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141008/bin/o penssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141008.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace
Re: svn commit: r1630110 - in /tomcat/trunk: java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/VersionLoggerListener.java webapps/docs/changelog.xml webapps/doc
2014-10-08 18:05 GMT+04:00 ma...@apache.org: Author: markt Date: Wed Oct 8 14:05:22 2014 New Revision: 1630110 URL: http://svn.apache.org/r1630110 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47919 Extend the information logged when Tomcat starts to optionally include (enabled by default) the values of key environment variables. I really do not like this. 1. Does this even work? Those variables are local to shell process. They are not exported (and there is no need for them to be). The Java process should not inherit them. 2. There are many ways to launch Tomcat besides catalina.sh/catalina.bat. This logging has no meaning when launching Tomcat as a Windows service, or launching it from within IDE, and in other circumstances. Those variables are just internal details of how catalina.sh/catalina.bat scripts are implemented. Even if you log a variable, there is no guarantee that the value is actually used by java process. 3. catalina.sh/catalina.bat already logs a number of those variables. Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/listeners.xml (...) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630194 - in /tomcat/trunk/java/org/apache/tomcat/websocket/server: LocalStrings.properties UpgradeUtil.java
Author: markt
Date: Wed Oct 8 18:40:56 2014
New Revision: 1630194
URL: http://svn.apache.org/r1630194
Log:
Fix an i18n TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1630194r1=1630193r2=1630194view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
Wed Oct 8 18:40:56 2014
@@ -24,6 +24,8 @@ serverContainer.servletContextMismatch=A
serverContainer.servletContextMissing=No ServletContext was specified
serverContainer.threadGroupNotDestroyed=Unable to destroy WebSocket thread
group [{0}] as [{1}] threads were still running when the web application was
stopped. The thread group will be destroyed once the threads terminate.
+upgradeUtil.incompatibleRsv=Extensions were specified that have incompatible
RSV bit usage
+
uriTemplate.duplicateParameter=The parameter [{0}] appears more than once in
the path which is not permitted
uriTemplate.emptySegment=The path [{0}] contains one or more empty segments
which are is not permitted
uriTemplate.invalidPath=The path [{0}] is not valid.
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1630194r1=1630193r2=1630194view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Wed
Oct 8 18:40:56 2014
@@ -37,6 +37,7 @@ import javax.websocket.HandshakeResponse
import javax.websocket.server.ServerEndpointConfig;
import org.apache.tomcat.util.codec.binary.Base64;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.security.ConcurrentMessageDigest;
import org.apache.tomcat.websocket.Constants;
import org.apache.tomcat.websocket.Transformation;
@@ -47,6 +48,8 @@ import org.apache.tomcat.websocket.pojo.
public class UpgradeUtil {
+private static final StringManager sm =
+StringManager.getManager(UpgradeUtil.class.getPackage().getName());
private static final byte[] WS_ACCEPT =
258EAFA5-E914-47DA-95CA-C5AB0DC85B11.getBytes(
StandardCharsets.ISO_8859_1);
@@ -165,8 +168,7 @@ public class UpgradeUtil {
// Now we have the full pipeline, validate the use of the RSV bits.
if (transformation != null !transformation.validateRsvBits(0)) {
-// TODO i18n
-throw new ServletException(Incompatible RSV bit usage);
+throw new
ServletException(sm.getString(upgradeUtil.incompatibleRsv));
}
// If we got this far, all is good. Accept the connection.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1630110 - in /tomcat/trunk: java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/VersionLoggerListener.java webapps/docs/changelog.xml webapps/doc
On 08/10/2014 19:36, Konstantin Kolinko wrote: 2014-10-08 18:05 GMT+04:00 ma...@apache.org: Author: markt Date: Wed Oct 8 14:05:22 2014 New Revision: 1630110 URL: http://svn.apache.org/r1630110 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47919 Extend the information logged when Tomcat starts to optionally include (enabled by default) the values of key environment variables. I really do not like this. 1. Does this even work? Yes. Those variables are local to shell process. They are not exported (and there is no need for them to be). The Java process should not inherit them. 2. There are many ways to launch Tomcat besides catalina.sh/catalina.bat. This logging has no meaning when launching Tomcat as a Windows service, or launching it from within IDE, and in other circumstances. True. Those variables are just internal details of how catalina.sh/catalina.bat scripts are implemented. Even if you log a variable, there is no guarantee that the value is actually used by java process. Also true. 3. catalina.sh/catalina.bat already logs a number of those variables. Indeed but if you read the bug report you'll see what strikes me as a reasonable use case. An alternative approach would be to log the CATALINA_BASE and CATALINA_HOME system properties (since Tomcat uses these) along with the result of ManagementFactory.getRuntimeMXBean().getInputArguments() Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630199 - /tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
Author: markt
Date: Wed Oct 8 19:01:20 2014
New Revision: 1630199
URL: http://svn.apache.org/r1630199
Log:
NPE protection. Note NPE only possible with test code.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1630199r1=1630198r2=1630199view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Wed Oct 8 19:01:20
2014
@@ -332,21 +332,23 @@ public class Util {
throws DeploymentException{
ListDecoderEntry result = new ArrayList();
-for (Class? extends Decoder decoderClazz : decoderClazzes) {
-// Need to instantiate decoder to ensure it is valid and that
-// deployment can be failed if it is not
-@SuppressWarnings(unused)
-Decoder instance;
-try {
-instance = decoderClazz.newInstance();
-} catch (InstantiationException | IllegalAccessException e) {
-throw new DeploymentException(
-sm.getString(pojoMethodMapping.invalidDecoder,
-decoderClazz.getName()), e);
+if (decoderClazzes != null) {
+for (Class? extends Decoder decoderClazz : decoderClazzes) {
+// Need to instantiate decoder to ensure it is valid and that
+// deployment can be failed if it is not
+@SuppressWarnings(unused)
+Decoder instance;
+try {
+instance = decoderClazz.newInstance();
+} catch (InstantiationException | IllegalAccessException e) {
+throw new DeploymentException(
+sm.getString(pojoMethodMapping.invalidDecoder,
+decoderClazz.getName()), e);
+}
+DecoderEntry entry = new DecoderEntry(
+Util.getDecoderType(decoderClazz), decoderClazz);
+result.add(entry);
}
-DecoderEntry entry = new DecoderEntry(
-Util.getDecoderType(decoderClazz), decoderClazz);
-result.add(entry);
}
return result;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630203 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsFrameClient.java
Author: markt
Date: Wed Oct 8 19:08:31 2014
New Revision: 1630203
URL: http://svn.apache.org/r1630203
Log:
Add debug logging for IOEs while reading data from server
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1630203r1=1630202r2=1630203view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed
Oct 8 19:08:31 2014
@@ -62,6 +62,8 @@ wsFrame.sessionClosed=The client data ca
wsFrame.textMessageTooBig=The decoded text message was too big for the output
buffer and the endpoint does not support partial messages
wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] for a message
with opCode [{1}] which was not supported by this endpoint
+wsFrameClient.ioe=Failure while reading data sent by server
+
wsRemoteEndpoint.closed=Message will not be sent because the WebSocket session
has been closed
wsRemoteEndpoint.closedDuringMessage=The remainder of the message will not be
sent because the WebSocket session has been closed
wsRemoteEndpoint.closedOutputStream=This method may not be called as the
OutputStream has been closed
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1630203r1=1630202r2=1630203view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Wed Oct 8
19:08:31 2014
@@ -23,8 +23,16 @@ import java.nio.channels.CompletionHandl
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
+
public class WsFrameClient extends WsFrameBase {
+private final Log log = LogFactory.getLog(WsFrameClient.class);
+private static final StringManager sm =
+StringManager.getManager(Constants.PACKAGE_NAME);
+
private final AsyncChannelWrapper channel;
private final CompletionHandlerInteger,Void handler;
// Not final as it may need to be re-sized
@@ -111,6 +119,7 @@ public class WsFrameClient extends WsFra
// continuing to send a message after the server sent a close
// control message.
if (isOpen()) {
+log.debug(sm.getString(wsFrameClient.ioe, e));
close(e);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 22 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.9-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.9-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20141008.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/comm ons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20141008.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20141008.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20141008.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-19.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.9-SNAPSHOT.jar setproxy: downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.9-SNAPSHOT on 2912 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/build.xml:227:3: File contains tab characters (this is the first instance). [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:64: Line matches the illegal pattern '\s+$'. [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:151: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:543: Got 3 errors and 0 warnings. Total time: 21 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20141008180055, vmgump.apache.org:vmgump:20141008180055 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630208 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsWebSocketContainer.java
Author: markt
Date: Wed Oct 8 19:26:28 2014
New Revision: 1630208
URL: http://svn.apache.org/r1630208
Log:
Fix an i18n TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1630208r1=1630207r2=1630208view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed
Oct 8 19:26:28 2014
@@ -102,6 +102,7 @@ wsWebSocketContainer.asynchronousSocketC
wsWebSocketContainer.defaultConfiguratorFaill=Failed to create the default
configurator
wsWebSocketContainer.endpointCreateFail=Failed to create a local endpoint of
type [{0}]
wsWebSocketContainer.httpRequestFailed=The HTTP request to initiate the
WebSocket connection failed
+wsWebSocketContainer.invalidExtensionParameters=The server responded with
extension parameters the client is unable to support
wsWebSocketContainer.invalidHeader=Unable to parse HTTP header as no colon is
present to delimit header name and header value in [{0}]. The header has been
skipped.
wsWebSocketContainer.invalidScheme=The requested scheme, [{0}], is not
supported. The supported schemes are ws and wss
wsWebSocketContainer.invalidStatus=The HTTP response from the server [{0}] did
not permit the HTTP upgrade to WebSocket
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1630208r1=1630207r2=1630208view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Wed
Oct 8 19:26:28 2014
@@ -333,8 +333,8 @@ public class WsWebSocketContainer
wrapper.add(extension.getParameters());
Transformation t = factory.create(extension.getName(),
wrapper, false);
if (t == null) {
-// TODO i18n
-throw new DeploymentException(Client requested parameters
it could not support);
+throw new DeploymentException(sm.getString(
+
wsWebSocketContainer.invalidExtensionParameters));
}
if (transformation == null) {
transformation = t;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630209 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt Date: Wed Oct 8 19:32:30 2014 New Revision: 1630209 URL: http://svn.apache.org/r1630209 Log: Address a TODO Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1630209r1=1630208r2=1630209view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Wed Oct 8 19:32:30 2014 @@ -632,7 +632,8 @@ public class WsWebSocketContainer } // Header names are case insensitive so always use lower case String headerName = line.substring(0, index).trim().toLowerCase(); -// TODO handle known multi-value headers +// Multi-value headers are stored as a single header and the client is +// expected to handle splitting into individual values String headerValue = line.substring(index + 1).trim(); ListString values = headers.get(headerName); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630210 - /tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Author: markt
Date: Wed Oct 8 19:32:59 2014
New Revision: 1630210
URL: http://svn.apache.org/r1630210
Log:
Correct logic (error detected by Autobahn test suite)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1630210r1=1630209r2=1630210view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Wed
Oct 8 19:32:59 2014
@@ -213,8 +213,8 @@ public class PerMessageDeflate implement
}
}
} else if (written == 0) {
-if (fin (isServer !serverContextTakeover ||
-!isServer !clientContextTakeover)) {
+if (fin (isServer !clientContextTakeover ||
+!isServer !serverContextTakeover)) {
inflater.reset();
}
return TransformationResult.END_OF_FRAME;
@@ -426,7 +426,7 @@ public class PerMessageDeflate implement
private void startNewMessage() {
firstCompressedFrameWritten = false;
-if (isServer !clientContextTakeover || !isServer
!serverContextTakeover) {
+if (isServer !serverContextTakeover || !isServer
!clientContextTakeover) {
deflater.reset();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630211 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Author: markt
Date: Wed Oct 8 19:35:05 2014
New Revision: 1630211
URL: http://svn.apache.org/r1630211
Log:
Expand Autobahn client test to include permessage-deflate
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java?rev=1630211r1=1630210r2=1630211view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Wed Oct 8 19:35:05 2014
@@ -19,10 +19,15 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.CountDownLatch;
import javax.websocket.ClientEndpoint;
+import javax.websocket.ClientEndpointConfig;
import javax.websocket.ContainerProvider;
+import javax.websocket.Endpoint;
+import javax.websocket.Extension;
import javax.websocket.OnClose;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
@@ -30,6 +35,7 @@ import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.websocket.pojo.PojoEndpointClient;
/**
* Runs the Autobahn test suite in client mode for testing the WebSocket client
@@ -37,7 +43,7 @@ import org.apache.tomcat.util.ExceptionU
*/
public class TesterWsClientAutobahn {
-private static final String HOST = localhost;
+private static final String HOST = linux6405.dev.local;
private static final int PORT = 9001;
private static final String USER_AGENT = ApacheTomcat8WebSocketClient;
@@ -82,7 +88,19 @@ public class TesterWsClientAutobahn {
URI uri = new URI(ws:// + HOST + : + PORT + /runCase?case= +
testCase + agent= + USER_AGENT);
TestCaseClient testCaseClient = new TestCaseClient();
-wsc.connectToServer(testCaseClient, uri);
+
+// TODO: Need to add ability to specify extensions when using
+// annotations
+Extension permessageDeflate = new WsExtension(permessage-deflate);
+ListExtension extensions = new ArrayList(1);
+extensions.add(permessageDeflate);
+
+Endpoint ep = new PojoEndpointClient(testCaseClient, null);
+ClientEndpointConfig.Builder builder =
ClientEndpointConfig.Builder.create();
+ClientEndpointConfig config = builder.extensions(extensions).build();
+
+
+wsc.connectToServer(ep, config, uri);
testCaseClient.waitForClose();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-bio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-bio/gump_work/build_tomcat-trunk_tomcat-trunk-test-bio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 18 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141008.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141008/bin/ openssl -Dexecute.test.apr=false -Dexecute.test.bio=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141008.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace
svn commit: r1630212 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Author: markt
Date: Wed Oct 8 19:39:59 2014
New Revision: 1630212
URL: http://svn.apache.org/r1630212
Log:
Revert unintentional change
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java?rev=1630212r1=1630211r2=1630212view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
Wed Oct 8 19:39:59 2014
@@ -43,7 +43,7 @@ import org.apache.tomcat.websocket.pojo.
*/
public class TesterWsClientAutobahn {
-private static final String HOST = linux6405.dev.local;
+private static final String HOST = localhost;
private static final int PORT = 9001;
private static final String USER_AGENT = ApacheTomcat8WebSocketClient;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1630216 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml
Author: markt Date: Wed Oct 8 19:52:08 2014 New Revision: 1630216 URL: http://svn.apache.org/r1630216 Log: Fix checkstyle nags Modified: tomcat/trunk/build.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1630216r1=1630215r2=1630216view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Oct 8 19:52:08 2014 @@ -221,10 +221,9 @@ /fileset /path - !-- Version info filter set -- tstamp - format property=year pattern= locale=en timezone=UTC/ +format property=year pattern= locale=en timezone=UTC/ format property=today pattern=MMM d locale=en timezone=UTC/ format property=today-iso-8601 pattern=-MM-dd locale=en timezone=UTC/ format property=tstamp pattern=HH:mm:ss locale=en timezone=UTC/ Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1630216r1=1630215r2=1630216view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 8 19:52:08 2014 @@ -61,7 +61,7 @@ add bug47919/bug: Extend the information logged when Tomcat starts to optionally include (enabled by default) the values of key environment -variables. (markt) +variables. (markt) /add fix bug55984/bug: Using the allow separators in version 0 cookies option @@ -148,7 +148,7 @@ /fix add Extend support for the codepermessage-deflate/code extension to the -client implementation. +client implementation. (markt) /add /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1630110 - in /tomcat/trunk: java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/VersionLoggerListener.java webapps/docs/changelog.xml webapps/doc
2014-10-08 22:48 GMT+04:00 Mark Thomas ma...@apache.org:
On 08/10/2014 19:36, Konstantin Kolinko wrote:
2014-10-08 18:05 GMT+04:00 ma...@apache.org:
Author: markt
Date: Wed Oct 8 14:05:22 2014
New Revision: 1630110
URL: http://svn.apache.org/r1630110
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47919
Extend the information logged when Tomcat starts to optionally include
(enabled by default) the values of key environment variables.
(...)
3. catalina.sh/catalina.bat already logs a number of those variables.
Indeed but if you read the bug report you'll see what strikes me as a
reasonable use case.
An alternative approach would be to log the CATALINA_BASE and
CATALINA_HOME system properties (since Tomcat uses these)
I am OK to log ${catalina.home}, ${catalina.base}, ${java.home},
${java.class.path}
For a reference,
http://docs.oracle.com/javase/8/docs/api/java/lang/System.html#getProperties--
I do not mind against logging of process environment variables, if it
is disabled by default. I would rather log all environment variables
(get map via System.getenv() and sort by key) instead of hard-coding
the list of ones used by the scripts.
Motivation for disabling env logging by default:
a) I do not believe that this works, as the variables are not exported.
(I cannot test on an *nix system today. Maybe you have sample output?)
b) Confusion for Windows service users.
(They sometimes set system environment variables and expect service
wrapper to use them. Logging the env values may give them a wrong idea
as if those values matter).
c) Security concerns
along with the
result of ManagementFactory.getRuntimeMXBean().getInputArguments()
Interesting. I have no experience with that MBean though.
As an example, Eclipse IDE logs its arguments. E.g.
${workspace}/.metadata/.log file starts with:
[[[
!SESSION 2014-10-02 16:55:44.313 ---
eclipse.buildId=4.4.0.I20140606-1215
java.version=1.7.0_67
java.vendor=Oracle Corporation
BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=ru_RU
Framework arguments: -product org.eclipse.epp.package.jee.product
Command-line arguments: -os win32 -ws win32 -arch x86 -product
org.eclipse.epp.package.jee.product
]]]
If I remember correctly, in jvm crash logs the command line arguments
are also listed.
I am OK to enable such logging by default, but it would be better to
also have an option to be able to turn off such logging.I think
that somebody may see indiscriminate logging of java arguments as a
security concern. I do not see this as security issue, as I expect
those to be visible with ps command, and thus passing sensitive
information via such arguments is a bad idea.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 59 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141008.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141008/bi n/openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141008.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 32 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141008/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141008.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141008-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141008/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141008.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/331 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1629294 Blamelist: BUILD FAILED: exception upload_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/332 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1629827 Blamelist: Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 6.0.42
Tested for https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 it is fixed The proposed 6.0.42 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 6.0.42 Stable On Wed, Oct 8, 2014 at 8:38 AM, Konstantin Kolinko knst.koli...@gmail.com wrote: 2014-10-01 0:48 GMT+04:00 jean-frederic clere jfcl...@gmail.com: The proposed Apache Tomcat 6.0.42 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.42/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1023/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_42/ The proposed 6.0.42 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 6.0.42 Stable Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- With Regards, Andrew Carr e. andrewlanec...@gmail.com w. andrew.c...@openlogic.com h. 4235255668 c. 4239489852 a. 101 Francis Drive, Greeneville, TN, 37743
Re: [VOTE] Release Apache Tomcat 6.0.42
Sorry for the gmail formatting of my text where it assumes my response should be trimmed, here is my vote, easier to see. [X] Stable - go ahead and release as 6.0.42 Stable Andrew On Wed, Oct 8, 2014 at 8:46 PM, Andrew Carr andrewlanec...@gmail.com wrote: Tested for https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 it is fixed The proposed 6.0.42 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 6.0.42 Stable On Wed, Oct 8, 2014 at 8:38 AM, Konstantin Kolinko knst.koli...@gmail.com wrote: 2014-10-01 0:48 GMT+04:00 jean-frederic clere jfcl...@gmail.com: The proposed Apache Tomcat 6.0.42 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.42/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1023/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_42/ The proposed 6.0.42 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 6.0.42 Stable Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- With Regards, Andrew Carr e. andrewlanec...@gmail.com w. andrew.c...@openlogic.com h. 4235255668 c. 4239489852 a. 101 Francis Drive, Greeneville, TN, 37743 -- With Regards, Andrew Carr e. andrewlanec...@gmail.com w. andrew.c...@openlogic.com h. 4235255668 c. 4239489852 a. 101 Francis Drive, Greeneville, TN, 37743
[GUMP@vmgump]: Project tomcat-trunk-test-bio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-bio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-bio/gump_work/build_tomcat-trunk_tomcat-trunk-test-bio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 21 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141009.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141009/bin/ openssl -Dexecute.test.apr=false -Dexecute.test.bio=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141009.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 32 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141009.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141009/bi n/openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141009.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 46 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141009.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141009/bin/o penssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141009.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 14 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141009/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141009.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141009-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141009/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141009.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
