Re: [VOTE] Release Apache Tomcat Connectors 1.2.36
On 09.05.2012 16:25, Mladen Turk wrote: Hi, Apache Tomcat Connectors 1.2.36 release candidate is ready for vote at [1]. This version solves shared memorz regression(s) found in released version 1.2.35 and allows )again= compiling against old httpd 1.3.x. The VOTE will remain open for at least 48 hours. The Apache Tomcat Connectors 1.2.36 is [X] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.36/ I didn't have enough time to review the changes and to actually test the release by running it, but I did some formal release checks. Since I won't be able to review the code changes during the next days I'm voting based on the formal release checks: +1 to release (and thanks for driving this) Remarks: The LICENSE, NOTICE and *.pdb files contained in the binary zips for Windows extract with permissions 700 for me on Unix (even when using umask 022). All other files are OK. Maybe some possible improvement of setting the perms after build and before zipping. File ltmain.sh in src tar and zip has perms 644 instead of 755. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337494 - /tomcat/jk/trunk/native/scripts/build/unix/config.sub
Author: rjung Date: Sat May 12 10:07:36 2012 New Revision: 1337494 URL: http://svn.apache.org/viewvc?rev=1337494&view=rev Log: Update config.sub from http://git.savannah.gnu.org/gitweb/?p=config.git. config.guess is still recent. Modified: tomcat/jk/trunk/native/scripts/build/unix/config.sub Modified: tomcat/jk/trunk/native/scripts/build/unix/config.sub URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.sub?rev=1337494&r1=1337493&r2=1337494&view=diff == --- tomcat/jk/trunk/native/scripts/build/unix/config.sub (original) +++ tomcat/jk/trunk/native/scripts/build/unix/config.sub Sat May 12 10:07:36 2012 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337535 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/comet/TestCometProcessor.java
Author: kkolinko Date: Sat May 12 13:20:59 2012 New Revision: 1337535 URL: http://svn.apache.org/viewvc?rev=1337535&view=rev Log: Merged revision 1337426 from tomcat/trunk: In TestCometProcessor: add diagnostic message that reports whether END event has ever been received. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337426 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1337535&r1=1337534&r2=1337535&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Sat May 12 13:20:59 2012 @@ -309,12 +309,14 @@ public class TestCometProcessor extends // Last message: [Client: END] // Last response line: [0] (empty chunk) // Last comet event: [END] +// END event occurred: [true] status.append("Status:"); status.append("\nWriterThread exception: " + writeThread.getException()); status.append("\nReaderThread exception: " + readThread.getException()); status.append("\nLast message: [" + lastMessage + "]"); status.append("\nLast response line: [" + lastResponseLine + "]"); status.append("\nLast comet event: [" + servlet.getLastEvent() + "]"); +status.append("\nEND event occurred: [" + servlet.getEndEventOccurred() + "]"); if (writeThread.getException() == null || !lastMessage.contains("Client: END") || !EventType.END.equals(servlet.getLastEvent())) { @@ -351,10 +353,16 @@ public class TestCometProcessor extends private volatile EventType lastEvent; +private volatile boolean endEventOccurred = false; + public EventType getLastEvent() { return lastEvent; } +public boolean getEndEventOccurred() { +return endEventOccurred; +} + @Override public void init() throws ServletException { failOnBegin = Boolean.valueOf(getServletConfig().getInitParameter( @@ -397,6 +405,7 @@ public class TestCometProcessor extends String msg = "READ: " + count + " bytes"; response.getWriter().print("Client: " + msg + "\r\n"); } else if (event.getEventType() == EventType.END) { +endEventOccurred = true; if (failOnEnd) { throw new IOException("Fail on end"); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337546 - /tomcat/trunk/webapps/docs/config/manager.xml
Author: kkolinko Date: Sat May 12 13:58:22 2012 New Revision: 1337546 URL: http://svn.apache.org/viewvc?rev=1337546&view=rev Log: Clarify the effect of maxActiveSessions attribute of a Manager. Modified: tomcat/trunk/webapps/docs/config/manager.xml Modified: tomcat/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1337546&r1=1337545&r2=1337546&view=diff == --- tomcat/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/trunk/webapps/docs/config/manager.xml Sat May 12 13:58:22 2012 @@ -81,7 +81,11 @@ The maximum number of active sessions that will be created by -this Manager, or -1 (the default) for no limit. +this Manager, or -1 (the default) for no limit. + +When the limit is reached, any attempt to create a new session +(e.g. with HttpServletRequest.getSession() call) +will fail with an IllegalStateException. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337547 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/manager.xml
Author: kkolinko Date: Sat May 12 14:00:47 2012 New Revision: 1337547 URL: http://svn.apache.org/viewvc?rev=1337547&view=rev Log: Merged revision 1337546 from tomcat/trunk: Clarify the effect of maxActiveSessions attribute of a Manager. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337546 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml?rev=1337547&r1=1337546&r2=1337547&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml Sat May 12 14:00:47 2012 @@ -81,7 +81,11 @@ The maximum number of active sessions that will be created by -this Manager, or -1 (the default) for no limit. +this Manager, or -1 (the default) for no limit. + +When the limit is reached, any attempt to create a new session +(e.g. with HttpServletRequest.getSession() call) +will fail with an IllegalStateException. - 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/562 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1337547 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[Bug 53203] Incorrect document of ajp connectionTimeout.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53203 Konstantin Kolinko changed: What|Removed |Added Attachment #28739|0 |1 is patch|| Attachment #28739|application/octet-stream|text/plain mime type|| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 53203] Incorrect document of ajp connectionTimeout.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53203 --- Comment #1 from Konstantin Kolinko --- I agree. For reference, the value is org.apache.coyote.ajp.Constants.DEFAULT_CONNECTION_TIMEOUT = -1 and it is used in constructor of specific protocol implementation by calling setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); -- You are receiving this mail because: You are the assignee for the bug.
svn commit: r1337572 - /tomcat/trunk/webapps/docs/config/ajp.xml
Author: kkolinko Date: Sat May 12 15:34:31 2012 New Revision: 1337572 URL: http://svn.apache.org/viewvc?rev=1337572&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=53203 Correct documentation of default value of connectionTimeout for AJP protocol. See org.apache.coyote.ajp.Constants.DEFAULT_CONNECTION_TIMEOUT I am not sure though whether -1 is actually infinite and not some other (JVM? OS?) default. The timeout is implemented in Endpoint, and thus the implementation is shared with HTTP protocol, and HTTP connectors documentation already says that -1 means infinite. So it is likely that it is indeed "infinite". Modified: tomcat/trunk/webapps/docs/config/ajp.xml Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1337572&r1=1337571&r2=1337572&view=diff == --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Sat May 12 15:34:31 2012 @@ -319,7 +319,8 @@ The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be - presented. The default value is 6 (i.e. 60 seconds). + presented. The default value for AJP protocol connectors + is -1 (i.e. infinite). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337573 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/ajp.xml
Author: kkolinko Date: Sat May 12 15:36:33 2012 New Revision: 1337573 URL: http://svn.apache.org/viewvc?rev=1337573&view=rev Log: Merged revision 1337572 from tomcat/trunk: https://issues.apache.org/bugzilla/show_bug.cgi?id=53203 Correct documentation of default value of connectionTimeout for AJP protocol. See org.apache.coyote.ajp.Constants.DEFAULT_CONNECTION_TIMEOUT Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337572 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml?rev=1337573&r1=1337572&r2=1337573&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Sat May 12 15:36:33 2012 @@ -319,7 +319,8 @@ The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be - presented. The default value is 6 (i.e. 60 seconds). + presented. The default value for AJP protocol connectors + is -1 (i.e. infinite). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337575 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sat May 12 15:43:25 2012 New Revision: 1337575 URL: http://svn.apache.org/viewvc?rev=1337575&view=rev Log: Update changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1337575&r1=1337574&r2=1337575&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat May 12 15:43:25 2012 @@ -141,7 +141,7 @@ mbean. (rjung) - + @@ -156,7 +156,7 @@ -Remove obsolete bug warning from windows service +Remove obsolete bug warning from Windows service documentation page. (rjung) @@ -166,6 +166,11 @@ 53158: Fix documented defaults for DBCP. Patch provided by ph.dezanneau at gmail.com. (rjung) + +53203: Correct documentation for the default value +of connectionTimeout attribute for AJP protocol +connectors. (kkolinko) + @@ -185,7 +190,7 @@ Add missing dependencies in pom files. (markt) -53034Add project.url and +53034: Add project.url and project.licenses sections to the POMs for the Maven artifacts. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53203] Incorrect document of ajp connectionTimeout.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53203 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Konstantin Kolinko --- Fixed and will be in 7.0.28. -- You are receiving this mail because: You are the assignee for the bug.
Re: SpdyProxyProtocol class using AJP constants
On Sat, May 12, 2012 at 8:08 AM, Konstantin Kolinko wrote: > Hi! > > The SpdyProxyProtocol class (exists in trunk only) uses ajp.Constants > class: > >setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); >setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); >setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); > > > The value of DEFAULT_CONNECTION_TIMEOUT in AJP is -1, > as opposed to 6 of HTTP. It seems to be a wrong value to be used here. > > Maybe default to 6 and let one to set "-1" explicitly if it is needed > (when SPDY is used as a replacement for AJP). > > BTW, the fields "cHandler" and "spdyContext" could be private instead > of package-visible. > +1 - do you want to make the changes, or should I? However the timeout should be higher than for http - the connection is multiplexed. IMHO the max connections and timeouts in tomcat are slightly low for current hardware... Did it work for you ? I didn't hear any feedback - I'm running it on my home server and seems ok with both nio and java7. Costin > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 53034] apache tomcat deployed pom does not contain url or license
https://issues.apache.org/bugzilla/show_bug.cgi?id=53034 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #3 from Konstantin Kolinko --- Regarding multiple licenses (AL + CDDL) in tomcat-jsp-api.pom, tomcat-servlet-api.pom: The comment in description of the "licenses" element [1] says that "If multiple licenses are listed, it is assumed that the user can select any of them, not that they must accept all." Actually CDDL applies only to DTD and schema files in those JARs. [1] http://maven.apache.org/xsd/maven-4.0.0.xsd [2] http://maven.apache.org/ref/3.0.4/maven-model/maven.html BTW, I think that the more correct URL would be with a trailing slash, http://tomcat.apache.org/ -- You are receiving this mail because: You are the assignee for the bug.
Re: SpdyProxyProtocol class using AJP constants
2012/5/12 Costin Manolache : > On Sat, May 12, 2012 at 8:08 AM, Konstantin Kolinko > wrote: > >> Hi! >> >> The SpdyProxyProtocol class (exists in trunk only) uses ajp.Constants >> class: >> >> setSoLinger(Constants.DEFAULT_CONNECTION_LINGER); >> setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT); >> setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY); >> >> >> The value of DEFAULT_CONNECTION_TIMEOUT in AJP is -1, >> as opposed to 6 of HTTP. It seems to be a wrong value to be used here. >> >> Maybe default to 6 and let one to set "-1" explicitly if it is needed >> (when SPDY is used as a replacement for AJP). >> >> BTW, the fields "cHandler" and "spdyContext" could be private instead >> of package-visible. >> > > +1 - do you want to make the changes, or should I? However the timeout > should be higher than for http - the connection is multiplexed. IMHO the > max connections and timeouts in tomcat are slightly low for current > hardware... > 20 seconds or 60 seconds seems to be realistic. Is there a reason to expect longer delay from valid clients? > Did it work for you ? I didn't hear any feedback - I'm running it on my > home server and seems ok with both nio and java7. > I was just searching for references to DEFAULT_CONNECTION_TIMEOUT to clarify an issue in documentation ([1]) and stumbled upon this oddity. I have not tried to run the class. I think it is for you to fix. I think that spdy package just needs its own copy of the Constants class. [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=53203 Best regards, Konstantin Kolinko - 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-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/564 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1337575 Blamelist: kkolinko 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
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) 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-tc7.0.x-test 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-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 21 mins 59 secs Command Line: /usr/lib/jvm/java-6-openjdk/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/dist/junit-12052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-12052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-12052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-12052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-12052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-12052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-12052012.jar:/srv/gump/ public/workspace/junit/dist/junit-12052012.jar - [junit] May 12, 2012 4:48:03 PM org.apache.catalina.startup.Conte
svn commit: r1337591 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: kkolinko Date: Sat May 12 16:51:02 2012 New Revision: 1337591 URL: http://svn.apache.org/viewvc?rev=1337591&view=rev Log: Followup to r1336516 Add Javadoc (as asked by sebb) and avoid looking up a volatile field twice Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1337591&r1=1337590&r2=1337591&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sat May 12 16:51:02 2012 @@ -174,9 +174,19 @@ public abstract class AbstractEndpoint { public int getMaxConnections() { return this.maxConnections; } +/** + * Return the current count of connections handled by this endpoint, if the + * connections are counted (which happens when the maximum count of + * connections is limited), or -1 if they are not. This + * property is added here so that this value can be inspected through JMX. + * It is visible on "ThreadPool" MBean. + * + * @return The count + */ public long getConnectionCount() { -if (connectionLimitLatch != null) { -return connectionLimitLatch.getCount(); +LimitLatch latch = connectionLimitLatch; +if (latch != null) { +return latch.getCount(); } return -1; } - 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 (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 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 : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 17 secs Command Line: /usr/lib/jvm/java-6-openjdk/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/dist/junit-12052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-12052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-12052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-12052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-12052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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-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.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/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/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.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/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org .eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-12052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-da
svn commit: r1337595 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: kkolinko Date: Sat May 12 17:19:38 2012 New Revision: 1337595 URL: http://svn.apache.org/viewvc?rev=1337595&view=rev Log: Further clarify the value Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1337595&r1=1337594&r2=1337595&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sat May 12 17:19:38 2012 @@ -181,6 +181,11 @@ public abstract class AbstractEndpoint { * property is added here so that this value can be inspected through JMX. * It is visible on "ThreadPool" MBean. * + * The count is incremented by the Acceptor before it tries to accept a + * new connection. Until the limit is reached and thus the count cannot be + * incremented, this value is more by 1 (the count of acceptors) than the + * actual count of connections that are being served. + * * @return The count */ public long getConnectionCount() { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1336516 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml
2012/5/10 sebb : > On 10 May 2012 08:50, wrote: >> Author: rjung >> Date: Thu May 10 07:50:29 2012 >> New Revision: 1336516 >> >> URL: http://svn.apache.org/viewvc?rev=1336516&view=rev >> Log: >> Add public method to retrieve the current connectionCount >> from an endpoint. >> >> It will also show up in the ThreadPool MBean. >> >> Backport of r1336515 from trunk. >> >> Modified: >> tomcat/tc7.0.x/trunk/ (props changed) >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java >> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >> >> Propchange: tomcat/tc7.0.x/trunk/ >> -- >> Merged /tomcat/trunk:r1336515 >> >> Modified: >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1336516&r1=1336515&r2=1336516&view=diff >> == >> --- >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java >> (original) >> +++ >> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java >> Thu May 10 07:50:29 2012 >> @@ -173,6 +173,14 @@ public abstract class AbstractEndpoint { >> } >> >> public int getMaxConnections() { return this.maxConnections; } >> + > > Javadoc? > In particular, it would help if the condition under which -1 is > returned were documented. ... > Done. >> + public long getConnectionCount() { >> + if (connectionLimitLatch != null) { >> + return connectionLimitLatch.getCount(); >> + } >> + return -1; >> + } >> + 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: r1337597 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: kkolinko Date: Sat May 12 17:24:07 2012 New Revision: 1337597 URL: http://svn.apache.org/viewvc?rev=1337597&view=rev Log: Merged revisions r1337591 r1337595 from tomcat/trunk: Followup to r1336516 Add Javadoc (as asked by sebb) and avoid looking up a volatile field twice Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337591-1337595 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1337597&r1=1337596&r2=1337597&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sat May 12 17:24:07 2012 @@ -174,9 +174,24 @@ public abstract class AbstractEndpoint { public int getMaxConnections() { return this.maxConnections; } +/** + * Return the current count of connections handled by this endpoint, if the + * connections are counted (which happens when the maximum count of + * connections is limited), or -1 if they are not. This + * property is added here so that this value can be inspected through JMX. + * It is visible on "ThreadPool" MBean. + * + * The count is incremented by the Acceptor before it tries to accept a + * new connection. Until the limit is reached and thus the count cannot be + * incremented, this value is more by 1 (the count of acceptors) than the + * actual count of connections that are being served. + * + * @return The count + */ public long getConnectionCount() { -if (connectionLimitLatch != null) { -return connectionLimitLatch.getCount(); +LimitLatch latch = connectionLimitLatch; +if (latch != null) { +return latch.getCount(); } return -1; } - 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-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2969 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1337595 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[Bug 53034] apache tomcat deployed pom does not contain url or license
https://issues.apache.org/bugzilla/show_bug.cgi?id=53034 --- Comment #4 from Mark Thomas --- So, how do you suggest we handle this? Merge the two entries into a single AL2+CDDL entry? -- You are receiving this mail because: You are the assignee for the bug.
[Bug 53034] apache tomcat deployed pom does not contain url or license
https://issues.apache.org/bugzilla/show_bug.cgi?id=53034 --- Comment #5 from Konstantin Kolinko --- There is "comments" element in License type. Let's use that to describe what CDDL applies to. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 53225] New: IllegalStateException "zip file closed" with resource from webfragment jar if JreMemoryLeakPreventionListener is removed
https://issues.apache.org/bugzilla/show_bug.cgi?id=53225 Priority: P2 Bug ID: 53225 Assignee: dev@tomcat.apache.org Summary: IllegalStateException "zip file closed" with resource from webfragment jar if JreMemoryLeakPreventionListener is removed Severity: normal Classification: Unclassified OS: Windows XP Reporter: knst.koli...@gmail.com Hardware: PC Status: NEW Version: 7.0.27 Component: Catalina Product: Tomcat 7 Created attachment 28764 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28764&action=edit icontest.war The issue was reported in the following thread on users@: http://markmail.org/thread/m6fimchl2jk2vyl4 http://marc.info/?t=13366532875&r=1&w=2 I am able to reproduce the issue on current trunk with the following steps: 1. Remove JreMemoryLeakPreventionListener from server.xml 2. Deploy the attached war file, icontest.war It contains WEB-INF/lib/icon.jar with several copies of Tomcat icon 3. Start Tomcat and access the following URL: http://localhost:8080/icontest/favicon.ico Expected behaviour: The icon is displayed Actual behaviour: [[[ 13-May-2012 00:23:05.906 SEVERE [http-bio-8080-exec-1] org.apache.coyote.http11.AbstractHttp11Processor.process Error processing request java.lang.IllegalStateException: zip file closed at java.util.jar.JarFile.getMetaInfEntryNames(Native Method) at java.util.jar.JarFile.maybeInstantiateVerifier(JarFile.java:279) at java.util.jar.JarFile.getInputStream(JarFile.java:383) at org.apache.naming.resources.WARDirContext$WARResource.streamContent(WARDirContext.java:990) at org.apache.naming.resources.ProxyDirContext.cacheLoad(ProxyDirContext.java:1621) at org.apache.naming.resources.ProxyDirContext.cacheLookup(ProxyDirContext.java:1501) at org.apache.naming.resources.ProxyDirContext.lookup(ProxyDirContext.java:262) at org.apache.tomcat.util.http.mapper.Mapper.internalMapWrapper(Mapper.java:996) at org.apache.tomcat.util.http.mapper.Mapper.internalMap(Mapper.java:808) at org.apache.tomcat.util.http.mapper.Mapper.map(Mapper.java:671) at org.apache.catalina.connector.CoyoteAdapter.postParseRequest(CoyoteAdapter.java:646) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:402) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:995) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:573) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:145) at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:311) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:662) ]]] -- You are receiving this mail because: You are the assignee for the bug.
svn commit: r1337643 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Author: markt Date: Sat May 12 20:51:24 2012 New Revision: 1337643 URL: http://svn.apache.org/viewvc?rev=1337643&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53067 Make sure request is unwrapped before we cast it to the internal Tomcat implementation Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1337643&r1=1337642&r2=1337643&view=diff == --- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Sat May 12 20:51:24 2012 @@ -27,6 +27,8 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletRequestWrapper; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -112,9 +114,19 @@ public abstract class WebSocketServlet e // TODO } -// Small hack until the Servlet API provides a way to do this. StreamInbound inbound = createWebSocketInbound(subProtocol); -((RequestFacade) req).doUpgrade(inbound); + +// Small hack until the Servlet API provides a way to do this. +ServletRequest inner = req; +// Unwrap the request +while (inner instanceof ServletRequestWrapper) { +inner = ((ServletRequestWrapper) inner).getRequest(); +} +if (inner instanceof RequestFacade) { +((RequestFacade) req).doUpgrade(inbound); +} else { +resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); +} } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337648 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/websocket/WebSocketServlet.java webapps/docs/changelog.xml
Author: markt Date: Sat May 12 21:00:02 2012 New Revision: 1337648 URL: http://svn.apache.org/viewvc?rev=1337648&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53067 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337643 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1337648&r1=1337647&r2=1337648&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Sat May 12 21:00:02 2012 @@ -27,6 +27,8 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletRequestWrapper; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -112,9 +114,19 @@ public abstract class WebSocketServlet e // TODO } -// Small hack until the Servlet API provides a way to do this. StreamInbound inbound = createWebSocketInbound(subProtocol); -((RequestFacade) req).doUpgrade(inbound); + +// Small hack until the Servlet API provides a way to do this. +ServletRequest inner = req; +// Unwrap the request +while (inner instanceof ServletRequestWrapper) { +inner = ((ServletRequestWrapper) inner).getRequest(); +} +if (inner instanceof RequestFacade) { +((RequestFacade) req).doUpgrade(inbound); +} else { +resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); +} } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1337648&r1=1337647&r2=1337648&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat May 12 21:00:02 2012 @@ -108,6 +108,10 @@ 53062: When constructing absolute URLs for redirects from relative URLs ensure that the resulting URLs are normalized. (markt) + +53067: Ensure the WebSocket Servlet continues to work when +requests are wrapped. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53067] WebSocket implementation issue with wrapped requests
https://issues.apache.org/bugzilla/show_bug.cgi?id=53067 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. Fixed in trunk and trunk and 7.0.x and will be included in 7.0.28 onwards. -- You are receiving this mail because: You are the assignee for the bug.
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/2970 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1337643 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: svn commit: r1337643 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
2012/5/13 : > Author: markt > Date: Sat May 12 20:51:24 2012 > New Revision: 1337643 > > URL: http://svn.apache.org/viewvc?rev=1337643&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53067 > Make sure request is unwrapped before we cast it to the internal Tomcat > implementation > > Modified: > tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java > > Modified: > tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1337643&r1=1337642&r2=1337643&view=diff > == > --- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Sat > May 12 20:51:24 2012 > @@ -27,6 +27,8 @@ import java.util.Queue; > import java.util.concurrent.ConcurrentLinkedQueue; > > import javax.servlet.ServletException; > +import javax.servlet.ServletRequest; > +import javax.servlet.ServletRequestWrapper; > import javax.servlet.http.HttpServlet; > import javax.servlet.http.HttpServletRequest; > import javax.servlet.http.HttpServletResponse; > @@ -112,9 +114,19 @@ public abstract class WebSocketServlet e > // TODO > } > > - // Small hack until the Servlet API provides a way to do this. > StreamInbound inbound = createWebSocketInbound(subProtocol); > - ((RequestFacade) req).doUpgrade(inbound); > + > + // Small hack until the Servlet API provides a way to do this. > + ServletRequest inner = req; > + // Unwrap the request > + while (inner instanceof ServletRequestWrapper) { > + inner = ((ServletRequestWrapper) inner).getRequest(); > + } > + if (inner instanceof RequestFacade) { > + ((RequestFacade) req).doUpgrade(inbound); inner.doUpgrade(), not req. > + } else { > + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); It would be hard to find what is the cause of an issue if it is just a generic error 500. Maybe just throw a ServletException and let the ErrorReportValve to handle the rest? Well, just blatantly casting to RequestFacade will do effectively the same. > + } > } > Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1337643 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
On 12/05/2012 23:14, Konstantin Kolinko wrote: > 2012/5/13 : >> Author: markt >> Date: Sat May 12 20:51:24 2012 >> New Revision: 1337643 >> +if (inner instanceof RequestFacade) { >> +((RequestFacade) req).doUpgrade(inbound); > > inner.doUpgrade(), not req. Doh. > >> +} else { >> +resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); > > It would be hard to find what is the cause of an issue if it is just a > generic error 500. > > Maybe just throw a ServletException and let the ErrorReportValve to > handle the rest? > Well, just blatantly casting to RequestFacade will do effectively the same. I'll add a message. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337707 - in /tomcat/trunk/java/org/apache/catalina/websocket: LocalStrings.properties WebSocketServlet.java
Author: markt Date: Sat May 12 22:20:38 2012 New Revision: 1337707 URL: http://svn.apache.org/viewvc?rev=1337707&view=rev Log: kkolinko review of r1337643 Modified: tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Modified: tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties?rev=1337707&r1=1337706&r2=1337707&view=diff == --- tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/websocket/LocalStrings.properties Sat May 12 22:20:38 2012 @@ -24,4 +24,6 @@ is.unknownOpCode=A frame with the unreco message.bufferTooSmall=The buffer is not big enough to contain the message currently being processed +servlet.reqUpgradeFail=Unable to cast to the Tomcat internal request class in order to complete HTTP upgrade + outbound.closed=The WebSocket connection has been closed \ No newline at end of file Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1337707&r1=1337706&r2=1337707&view=diff == --- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Sat May 12 22:20:38 2012 @@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRes import org.apache.catalina.connector.RequestFacade; import org.apache.catalina.util.Base64; import org.apache.tomcat.util.buf.B2CConverter; +import org.apache.tomcat.util.res.StringManager; /** * Provides the base implementation of a Servlet for processing WebSocket @@ -48,6 +49,8 @@ public abstract class WebSocketServlet e private static final byte[] WS_ACCEPT = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11".getBytes( B2CConverter.ISO_8859_1); +private static final StringManager sm = +StringManager.getManager(Constants.Package); private Queue sha1Helpers = new ConcurrentLinkedQueue(); @@ -123,9 +126,10 @@ public abstract class WebSocketServlet e inner = ((ServletRequestWrapper) inner).getRequest(); } if (inner instanceof RequestFacade) { -((RequestFacade) req).doUpgrade(inbound); +((RequestFacade) inner).doUpgrade(inbound); } else { -resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); +resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, +sm.getString("servlet.reqUpgradeFail")); } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337708 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/websocket/LocalStrings.properties java/org/apache/catalina/websocket/WebSocketServlet.java
Author: markt Date: Sat May 12 22:21:08 2012 New Revision: 1337708 URL: http://svn.apache.org/viewvc?rev=1337708&view=rev Log: kkolinko review of r1337643 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337707 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties?rev=1337708&r1=1337707&r2=1337708&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties Sat May 12 22:21:08 2012 @@ -24,4 +24,6 @@ is.unknownOpCode=A frame with the unreco message.bufferTooSmall=The buffer is not big enough to contain the message currently being processed +servlet.reqUpgradeFail=Unable to cast to the Tomcat internal request class in order to complete HTTP upgrade + outbound.closed=The WebSocket connection has been closed \ No newline at end of file Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1337708&r1=1337707&r2=1337708&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Sat May 12 22:21:08 2012 @@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRes import org.apache.catalina.connector.RequestFacade; import org.apache.catalina.util.Base64; import org.apache.tomcat.util.buf.B2CConverter; +import org.apache.tomcat.util.res.StringManager; /** * Provides the base implementation of a Servlet for processing WebSocket @@ -48,6 +49,8 @@ public abstract class WebSocketServlet e private static final byte[] WS_ACCEPT = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11".getBytes( B2CConverter.ISO_8859_1); +private static final StringManager sm = +StringManager.getManager(Constants.Package); private Queue sha1Helpers = new ConcurrentLinkedQueue(); @@ -123,9 +126,10 @@ public abstract class WebSocketServlet e inner = ((ServletRequestWrapper) inner).getRequest(); } if (inner instanceof RequestFacade) { -((RequestFacade) req).doUpgrade(inbound); +((RequestFacade) inner).doUpgrade(inbound); } else { -resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); +resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, +sm.getString("servlet.reqUpgradeFail")); } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 49828] Java products naming in RUNNING.txt
https://issues.apache.org/bugzilla/show_bug.cgi?id=49828 Ognjen Blagojevic changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #2 from Ognjen Blagojevic --- Closing this long time resolved bug. -- You are receiving this mail because: You are the assignee for the bug.
svn commit: r1337719 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java
Author: kkolinko Date: Sat May 12 23:06:04 2012 New Revision: 1337719 URL: http://svn.apache.org/viewvc?rev=1337719&view=rev Log: Fix several trivial HTML markup errors in example servlets e.g. duplicate tag preceding one. Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1337719&r1=1337718&r2=1337719&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat May 12 23:06:04 2012 @@ -60,13 +60,12 @@ public class CookieExample extends HttpS PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("cookies.title"); out.println("" + title + ""); out.println(""); -out.println(""); +out.println(""); // relative links Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1337719&r1=1337718&r2=1337719&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Sat May 12 23:06:04 2012 @@ -51,13 +51,12 @@ public class RequestHeaderExample extend PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("requestheader.title"); out.println("" + title + ""); out.println(""); -out.println(""); +out.println(""); // all links relative Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337719&r1=1337718&r2=1337719&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:06:04 2012 @@ -50,7 +50,6 @@ public class RequestInfoExample extends PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("requestinfo.title"); Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=1337719&r1=1337718&r2=1337719&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java Sat May 12 23:06:04 2012 @@ -50,7 +50,6 @@ public class RequestParamExample extends PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("requestparams.title"); Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=1337719&r1=1337718&r2=1337719&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Sat May 12 23:06:04 2012 @@ -53,13 +53,12 @@ public class SessionExample extends Http PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("sessions.title"); out.println("" + title + ""); out.println(""); -out.println(""); +out.println(""); // img stuff not req'd for source code html showing // relative links everywhere! @@ -130,14 +129,11 @@ public class SessionExample extends Http out.println(""); out.print("URL encoded "); out.println(""); out.println("");
svn commit: r1337730 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/examples/WEB-INF/classes/
Author: kkolinko Date: Sat May 12 23:17:21 2012 New Revision: 1337730 URL: http://svn.apache.org/viewvc?rev=1337730&view=rev Log: Merged revision 1337719 from tomcat/trunk: Fix several trivial HTML markup errors in example servlets e.g. duplicate tag preceding one. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337719 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1337730&r1=1337729&r2=1337730&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat May 12 23:17:21 2012 @@ -175,6 +175,9 @@ of connectionTimeout attribute for AJP protocol connectors. (kkolinko) + +Fix several trivial HTML markup errors in sample servlets. (kkolinko) + Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat May 12 23:17:21 2012 @@ -60,13 +60,12 @@ public class CookieExample extends HttpS PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("cookies.title"); out.println("" + title + ""); out.println(""); -out.println(""); +out.println(""); // relative links Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Sat May 12 23:17:21 2012 @@ -51,13 +51,12 @@ public class RequestHeaderExample extend PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("requestheader.title"); out.println("" + title + ""); out.println(""); -out.println(""); +out.println(""); // all links relative Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:17:21 2012 @@ -50,7 +50,6 @@ public class RequestInfoExample extends PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("requestinfo.title"); Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=1337730&r1=1337729&r2=1337730&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java Sat May 12 23:17:21 2012 @@ -50,7 +50,6 @@ public class RequestParamExample extends PrintWriter out = response.getWriter(); out.println(""); -out.println(""); out.println(""); String title = RB.getString("requestparams.title"); Modified: tomcat/tc7.0.x/tr
svn commit: r1337734 - /tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Author: kkolinko Date: Sat May 12 23:26:31 2012 New Revision: 1337734 URL: http://svn.apache.org/viewvc?rev=1337734&view=rev Log: Simplify code and correct HTML markup Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337734&r1=1337733&r2=1337734&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:26:31 2012 @@ -90,21 +90,21 @@ public class RequestInfoExample extends out.println(HTMLFilter.filter(request.getPathInfo())); out.println(""); out.println(RB.getString("requestinfo.label.remoteaddr")); - -String cipherSuite= -(String)request.getAttribute("javax.servlet.request.cipher_suite"); out.println(""); out.println(request.getRemoteAddr()); -out.println(""); +out.println(""); +String cipherSuite= + (String)request.getAttribute("javax.servlet.request.cipher_suite"); if(cipherSuite!=null){ -out.println(""); +out.println(""); out.println("SSLCipherSuite:"); -out.println(""); -out.println(""); - out.println(request.getAttribute("javax.servlet.request.cipher_suite")); -out.println(""); +out.println(""); +out.println(cipherSuite); +out.println(""); } + +out.println(""); } @Override - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337735 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/RequestInfoExample.java
Author: kkolinko Date: Sat May 12 23:31:28 2012 New Revision: 1337735 URL: http://svn.apache.org/viewvc?rev=1337735&view=rev Log: Merged revision 1337734 from tomcat/trunk: Simplify code and correct HTML markup in RequestInfoExample servlet. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337734 Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337735&r1=1337734&r2=1337735&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:31:28 2012 @@ -90,21 +90,21 @@ public class RequestInfoExample extends out.println(HTMLFilter.filter(request.getPathInfo())); out.println(""); out.println(RB.getString("requestinfo.label.remoteaddr")); - -String cipherSuite= -(String)request.getAttribute("javax.servlet.request.cipher_suite"); out.println(""); out.println(request.getRemoteAddr()); -out.println(""); +out.println(""); +String cipherSuite= + (String)request.getAttribute("javax.servlet.request.cipher_suite"); if(cipherSuite!=null){ -out.println(""); +out.println(""); out.println("SSLCipherSuite:"); -out.println(""); -out.println(""); - out.println(request.getAttribute("javax.servlet.request.cipher_suite")); -out.println(""); +out.println(""); +out.println(cipherSuite); +out.println(""); } + +out.println(""); } @Override - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337738 - /tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Author: kkolinko Date: Sat May 12 23:37:21 2012 New Revision: 1337738 URL: http://svn.apache.org/viewvc?rev=1337738&view=rev Log: CTR: whitespace tabs->spaces, remove trailing whitespace This is to simplify a patch that will follow. Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337738&r1=1337737&r2=1337738&view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:37:21 2012 @@ -53,12 +53,12 @@ public class RequestInfoExample extends out.println(""); // img stuff not req'd for source code html showing - // all links relative! +// all links relative! // XXX // making these absolute till we work out the // addition of a PathInfo issue - + out.println(""); out.println(""); @@ -73,34 +73,34 @@ public class RequestInfoExample extends out.println(request.getMethod()); out.println(""); out.println(rb.getString("requestinfo.label.requesturi")); -out.println(""); +out.println(""); out.println(HTMLFilter.filter(request.getRequestURI())); -out.println(""); +out.println(""); out.println(rb.getString("requestinfo.label.protocol")); -out.println(""); +out.println(""); out.println(request.getProtocol()); out.println(""); out.println(rb.getString("requestinfo.label.pathinfo")); -out.println(""); +out.println(""); out.println(HTMLFilter.filter(request.getPathInfo())); out.println(""); out.println(rb.getString("requestinfo.label.remoteaddr")); - String cipherSuite= - (String)request.getAttribute("javax.servlet.request.cipher_suite"); -out.println(""); +String cipherSuite= +(String)request.getAttribute("javax.servlet.request.cipher_suite"); +out.println(""); out.println(request.getRemoteAddr()); out.println(""); - if(cipherSuite!=null){ - out.println(""); - out.println("SSLCipherSuite:"); - out.println(""); - out.println(""); - out.println(request.getAttribute("javax.servlet.request.cipher_suite")); - out.println(""); - } - +if(cipherSuite!=null){ +out.println(""); +out.println("SSLCipherSuite:"); +out.println(""); +out.println(""); + out.println(request.getAttribute("javax.servlet.request.cipher_suite")); +out.println(""); +} + } public void doPost(HttpServletRequest request, - 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/568 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1337730 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
svn commit: r1337741 - /tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Author: kkolinko Date: Sat May 12 23:56:13 2012 New Revision: 1337741 URL: http://svn.apache.org/viewvc?rev=1337741&view=rev Log: Pass all string values through the filter in RequestInfoExample servlet. Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337741&r1=1337740&r2=1337741&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:56:13 2012 @@ -75,7 +75,7 @@ public class RequestInfoExample extends out.println(""); out.println(RB.getString("requestinfo.label.method")); out.println(""); -out.println(request.getMethod()); +out.println(HTMLFilter.filter(request.getMethod())); out.println(""); out.println(RB.getString("requestinfo.label.requesturi")); out.println(""); @@ -83,7 +83,7 @@ public class RequestInfoExample extends out.println(""); out.println(RB.getString("requestinfo.label.protocol")); out.println(""); -out.println(request.getProtocol()); +out.println(HTMLFilter.filter(request.getProtocol())); out.println(""); out.println(RB.getString("requestinfo.label.pathinfo")); out.println(""); @@ -91,7 +91,7 @@ public class RequestInfoExample extends out.println(""); out.println(RB.getString("requestinfo.label.remoteaddr")); out.println(""); -out.println(request.getRemoteAddr()); +out.println(HTMLFilter.filter(request.getRemoteAddr())); out.println(""); String cipherSuite= @@ -100,7 +100,7 @@ public class RequestInfoExample extends out.println(""); out.println("SSLCipherSuite:"); out.println(""); -out.println(cipherSuite); +out.println(HTMLFilter.filter(cipherSuite)); out.println(""); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337742 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/RequestInfoExample.java
Author: kkolinko Date: Sat May 12 23:58:37 2012 New Revision: 1337742 URL: http://svn.apache.org/viewvc?rev=1337742&view=rev Log: Merged revision 1337741 from tomcat/trunk: Pass all string values through the filter in RequestInfoExample servlet. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337741 Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337742&r1=1337741&r2=1337742&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat May 12 23:58:37 2012 @@ -75,7 +75,7 @@ public class RequestInfoExample extends out.println(""); out.println(RB.getString("requestinfo.label.method")); out.println(""); -out.println(request.getMethod()); +out.println(HTMLFilter.filter(request.getMethod())); out.println(""); out.println(RB.getString("requestinfo.label.requesturi")); out.println(""); @@ -83,7 +83,7 @@ public class RequestInfoExample extends out.println(""); out.println(RB.getString("requestinfo.label.protocol")); out.println(""); -out.println(request.getProtocol()); +out.println(HTMLFilter.filter(request.getProtocol())); out.println(""); out.println(RB.getString("requestinfo.label.pathinfo")); out.println(""); @@ -91,7 +91,7 @@ public class RequestInfoExample extends out.println(""); out.println(RB.getString("requestinfo.label.remoteaddr")); out.println(""); -out.println(request.getRemoteAddr()); +out.println(HTMLFilter.filter(request.getRemoteAddr())); out.println(""); String cipherSuite= @@ -100,7 +100,7 @@ public class RequestInfoExample extends out.println(""); out.println("SSLCipherSuite:"); out.println(""); -out.println(cipherSuite); +out.println(HTMLFilter.filter(cipherSuite)); out.println(""); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337745 - /tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
Author: kkolinko Date: Sun May 13 00:15:35 2012 New Revision: 1337745 URL: http://svn.apache.org/viewvc?rev=1337745&view=rev Log: Doh. Pass correct URL to encodeURL() call and safeguard it later. Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=1337745&r1=1337744&r2=1337745&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Sun May 13 00:15:35 2012 @@ -129,7 +129,7 @@ public class SessionExample extends Http out.println(""); out.print("URL encoded "); out.println(""); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337746 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/SessionExample.java
Author: kkolinko Date: Sun May 13 00:17:51 2012 New Revision: 1337746 URL: http://svn.apache.org/viewvc?rev=1337746&view=rev Log: Merged revision 1337745 from tomcat/trunk: Pass correct URL to encodeURL() call and safeguard it later. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1337745 Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=1337746&r1=1337745&r2=1337746&view=diff == --- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original) +++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Sun May 13 00:17:51 2012 @@ -129,7 +129,7 @@ public class SessionExample extends Http out.println(""); out.print("URL encoded "); out.println(""); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337749 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun May 13 00:22:59 2012 New Revision: 1337749 URL: http://svn.apache.org/viewvc?rev=1337749&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1337749&r1=1337748&r2=1337749&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 13 00:22:59 2012 @@ -188,6 +188,14 @@ PATCHES PROPOSED TO BACKPORT: (The revision to revert in 6.0.x is r769336) +1: markt, kkolinko, kfujino -1: + +* Fix several trivial HTML markup errors in example servlets + e.g. duplicate tag preceding and following + http://people.apache.org/~kkolinko/patches/2012-05-13_tc6_sampleservlets.patch + (backport of revs 1337719 1337734 1337741 1337745) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED - 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-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/569 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1337735 Blamelist: kkolinko 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
[Bug 53225] IllegalStateException "zip file closed" with resource from webfragment jar if JreMemoryLeakPreventionListener is removed
https://issues.apache.org/bugzilla/show_bug.cgi?id=53225 jie...@gmail.com changed: What|Removed |Added CC||jie...@gmail.com -- You are receiving this mail because: You are the assignee for the bug.
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2974 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1337741 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
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/2975 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1337745 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) 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-tc7.0.x-test 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-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 28 secs Command Line: /usr/lib/jvm/java-6-openjdk/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/dist/junit-13052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-13052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-13052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-13052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-13052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-13052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-13052012.jar:/srv/gump/ public/workspace/junit/dist/junit-13052012.jar - [junit] May 13, 2012 4:55:5
[GUMP@vmgump]: Project tomcat-trunk-test (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 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 : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 55 secs Command Line: /usr/lib/jvm/java-6-openjdk/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/dist/junit-13052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-13052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-13052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-13052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-13052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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-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.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/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/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.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/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org .eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-13052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-da