Re: [VOTE] Release Apache Tomcat 7.0.16
On 11/06/2011 12:33, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.16 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.16/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_16/ > > The proposed 7.0.16 release is: > > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 7.0.16 Alpha > [ ] Beta - go ahead and release as 7.0.16 Beta > [X] Stable - go ahead and release as 7.0.16 Stable Unit tests pass on 64-bit Windows TCKs all pass with security manager on 64-bit Linux JSP TCK tested with HTTP BIO Servlet TCK tested with all combinations (that make sense) of HTTP/AJP BIO/NIO/AJP mod_jk/mod_proxy_ajp/mod_proxy_http 7.0.16 has been used for the ASF Jira instance for 35 hours and counting without incident. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51306] NPE in DeltaRequest.writeExternal(DeltaRequest.java:267) when handling remote session expiration
https://issues.apache.org/bugzilla/show_bug.cgi?id=51306 --- Comment #8 from Ronald Klop 2011-06-15 08:59:35 UTC --- I have customers who are 'logged out' in their words and that correlates with the times of these errors in the logs. No hard evidence though. And the weirdest thing is that it only happens since two or three weeks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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 (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, and has been outstanding for 37 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 : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... 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: 21 mins 7 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-15062011.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15062011-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15062011-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-15062011.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/worksp ace/commons-dbcp-1.x -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-*[0-9T].jar -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-15062011.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/packages/junit3.8.1/junit.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/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/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-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-1506201
DO NOT REPLY [Bug 51376] New: Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc
https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 Bug #: 51376 Summary: Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc Product: Tomcat 7 Version: 7.0.14 Platform: PC OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: axt...@gmail.com Classification: Unclassified When a pre-existing instance of Servlet class is added dynamically by calling ServletContext.addServlet(String, Servlet) in ServletContainerInitializer, multiple problems arise: * setLoadOnStartup() is ignored * @ServletSecurity is ignored * destroy() can be called on non-initialized servlet Adding a servlet class (addServlet(String, String), addServlet(String, Class)) doesn't have this problems. It happens because methods of org.apache.catalina.core.StandardWrapper treat presence of servlet instance as an indicator of the fact that servlet have been initialized, that is not true when addServlet(String, Servlet) is used. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51376] Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc
https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 --- Comment #1 from Mark Thomas 2011-06-15 12:04:43 UTC --- (In reply to comment #0) > * @ServletSecurity is ignored This is as required by the Servlet spec (section 13.4.1) so this aspect of the bug report is INVALID. This is also made clear in the Servlet 3.0 Javadoc. I'm still researching the other issues. The specification is ambiguous on what to do here. I'm leaning towards making a change but I need to check that any such change doesn't trigger any TCK failures. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
svn commit: r1136010 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/ClassLoaderLogManager.java test/org/apache/juli/ webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Jun 15 12:20:01 2011
New Revision: 1136010
URL: http://svn.apache.org/viewvc?rev=1136010&view=rev
Log:
Improve system property replacement code in ClassLoaderLogManager of Tomcat
JULI.
Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
1. Do not use recursion.
2. Do not stop on the first unrecognized property, but continue with the rest
of the string.
3. Do not call System.getProperty() on an empty key, because it throws
IllegalArgumentException. Threat "${}" as unrecognized property.
It is backport of r1133857
Added:
tomcat/tc6.0.x/trunk/test/org/apache/juli/
- copied from r1136008, tomcat/trunk/test/org/apache/juli/
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1136010&r1=1136009&r2=1136010&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 15 12:20:01 2011
@@ -157,23 +157,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
- Improve system property replacement code in ClassLoaderLogManager of Tomcat
JULI.
- 1) Tests
- svn copy "^/tomcat/trunk/test/org/apache/juli" "test/org/apache/juli"
- 2) Patch (backport of r1133857)
-
http://people.apache.org/~kkolinko/patches/2011-06-09_tc6_ClassLoaderLogManager.patch
- It fixes the following issues:
- 1. Correctly search for "}" so properties in the form "}${property}" are
- correctly replaced. This is BZ 51249.
- Note, that ${property}${property} is already working in 6.0.32, thanks to
recursion.
- 2. Do not stop processing on first unrecognized property.
- The old code did not perform recursion if replacement failed.
- 3. Do not call System.getProperty() for empty property name,
- which was throwing IllegalArgumentException.
- +1: kkolinko, jung, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306.
Avoid NPE when handleSESSION_EXPIRED is processed while
handleSESSION_CREATED is being processed.
-setMaxInactiveInterval is not added to DeltaRequest in
handleSESSION_CREATED.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1136010&r1=1136009&r2=1136010&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Wed
Jun 15 12:20:01 2011
@@ -559,21 +559,29 @@ public class ClassLoaderLogManager exten
*/
protected String replace(String str) {
String result = str;
-int pos_start = result.indexOf("${");
-if (pos_start != -1) {
-int pos_end = result.indexOf('}');
-if (pos_end != -1) {
-String propName = result.substring(pos_start + 2, pos_end);
-String replacement = System.getProperty(propName);
+int pos_start = str.indexOf("${");
+if (pos_start >= 0) {
+StringBuilder builder = new StringBuilder();
+int pos_end = -1;
+while (pos_start >= 0) {
+builder.append(str, pos_end + 1, pos_start);
+pos_end = str.indexOf('}', pos_start + 2);
+if (pos_end < 0) {
+pos_end = pos_start - 1;
+break;
+}
+String propName = str.substring(pos_start + 2, pos_end);
+String replacement = propName.length() > 0 ? System
+.getProperty(propName) : null;
if (replacement != null) {
-if(pos_start >0) {
-result = result.substring(0,pos_start) +
-replacement + replace(result.substring(pos_end +
1));
-} else {
-result = replacement +
replace(result.substring(pos_end + 1));
-}
+builder.append(replacement);
+} else {
+builder.append(str, pos_start, pos_end + 1);
}
+pos_start = str.indexOf("${", pos_end + 1);
}
+builder.append(str, pos_end + 1, str.length());
+result = builder.toString();
}
return result;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1136010&r1=1136009&r2=1136010&view=diff
==
DO NOT REPLY [Bug 51249] JULI ClassLoaderLogManager doesn't properly handle ${} when replacing property values
https://issues.apache.org/bugzilla/show_bug.cgi?id=51249 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Konstantin Kolinko 2011-06-15 12:22:23 UTC --- The fix applied 6.0 in r1136010. Will be in 6.0.33. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
The failure happened in [junit] Test org.apache.catalina.core.TestAsyncContextImpl FAILED when running with NIO. Running the same test with BIO was OK. The log file from the test is [1]. [1]: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.core.TestAsyncContextImpl.NIO.txt.html The failure there: Testcase: testListeners took 6.23 sec FAILED Uri: /stage1, Status: 200, Time: 4999 junit.framework.AssertionFailedError: Uri: /stage1, Status: 200, Time: 4999 at org.apache.catalina.core.TestAsyncContextImpl.validateAccessLog(TestAsyncContextImpl.java:1052) at org.apache.catalina.core.TestAsyncContextImpl.testListeners(TestAsyncContextImpl.java:628) Best regards, Konstantin Kolinko 2011/6/15 Bill Barker : > 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, > and has been outstanding for 37 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 : Tomcat 7.x, a web server implementing Java Servlet > 3.0, > ... > > > 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: 21 mins 7 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-15062011.jar > -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15062011-native-src.tar.gz > > -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15062011-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-15062011.jar > > -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar > -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x > -Dcommons-dbcp.home=/srv/gump/public/worksp > ace/commons-dbcp-1.x > -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-*[0-9T].jar > > -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-15062011.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/packages/junit3.8.1/junit.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/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/worksp
DO NOT REPLY [Bug 51376] Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc
https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 --- Comment #2 from Mark Thomas 2011-06-15 12:48:20 UTC --- The Servlet TCK still passes with my change in place so I am going to go ahead and commit it to fix this issue. I'll be a little while as I need to write a test case first. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
On 15/06/2011 13:29, Konstantin Kolinko wrote: > The failure happened in > [junit] Test org.apache.catalina.core.TestAsyncContextImpl FAILED > > when running with NIO. Running the same test with BIO was OK. The log > file from the test is [1]. > > [1]: > http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.core.TestAsyncContextImpl.NIO.txt.html > > The failure there: > > Testcase: testListeners took 6.23 sec > FAILED > Uri: /stage1, Status: 200, Time: 4999 > junit.framework.AssertionFailedError: Uri: /stage1, Status: 200, Time: 4999 > at > org.apache.catalina.core.TestAsyncContextImpl.validateAccessLog(TestAsyncContextImpl.java:1052) > at > org.apache.catalina.core.TestAsyncContextImpl.testListeners(TestAsyncContextImpl.java:628) Looks like a timing issue with the AccessLog tests. These work for me when running locally. I'm tempted to leave the timings as is for now and see if we get regular failures. If we do, we can increase the margins. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136017 - /tomcat/trunk/webapps/docs/setup.xml
Author: markt Date: Wed Jun 15 12:55:24 2011 New Revision: 1136017 URL: http://svn.apache.org/viewvc?rev=1136017&view=rev Log: Fix typo reported by @earthgecko Modified: tomcat/trunk/webapps/docs/setup.xml Modified: tomcat/trunk/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/setup.xml?rev=1136017&r1=1136016&r2=1136017&view=diff == --- tomcat/trunk/webapps/docs/setup.xml (original) +++ tomcat/trunk/webapps/docs/setup.xml Wed Jun 15 12:55:24 2011 @@ -107,7 +107,7 @@ cd $CATALINA_HOME/bin -tar xvfz commons-deamon-native.tar.gz +tar xvfz commons-daemon-native.tar.gz cd commons-daemon-1.0.x-native-src/unix ./configure make - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136024 - in /tomcat: tc5.5.x/trunk/container/webapps/docs/setup.xml tc6.0.x/trunk/webapps/docs/setup.xml
Author: kkolinko Date: Wed Jun 15 13:16:06 2011 New Revision: 1136024 URL: http://svn.apache.org/viewvc?rev=1136024&view=rev Log: Backport of r1136017 Fix typo in documentation reported by @earthgecko Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml tomcat/tc6.0.x/trunk/webapps/docs/setup.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml?rev=1136024&r1=1136023&r2=1136024&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml Wed Jun 15 13:16:06 2011 @@ -111,7 +111,7 @@ cd $CATALINA_HOME/bin -tar xvfz commons-deamon-native.tar.gz +tar xvfz commons-daemon-native.tar.gz cd commons-daemon-1.0.x-native-src/unix ./configure make Modified: tomcat/tc6.0.x/trunk/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/setup.xml?rev=1136024&r1=1136023&r2=1136024&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/setup.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/setup.xml Wed Jun 15 13:16:06 2011 @@ -107,7 +107,7 @@ cd $CATALINA_HOME/bin -tar xvfz commons-deamon-native.tar.gz +tar xvfz commons-daemon-native.tar.gz cd commons-daemon-1.0.x-native-src/unix ./configure make - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136028 - in /tomcat/trunk: java/org/apache/catalina/core/StandardWrapper.java test/org/apache/catalina/core/TestStandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jun 15 13:21:16 2011
New Revision: 1136028
URL: http://svn.apache.org/viewvc?rev=1136028&view=rev
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1136028&r1=1136027&r2=1136028&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Jun 15
13:21:16 2011
@@ -1020,6 +1020,10 @@ public class StandardWrapper extends Con
public synchronized void load() throws ServletException {
instance = loadServlet();
+if (!instanceInitialized) {
+initServlet(instance);
+}
+
if (isJspServlet) {
StringBuilder oname =
new StringBuilder(MBeanUtils.getDomain(getParent()));
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1136028&r1=1136027&r2=1136028&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Wed Jun
15 13:21:16 2011
@@ -321,6 +321,90 @@ public class TestStandardContext extends
}
+public void testBug51376() throws Exception {
+// Set up a container
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+File docBase = new File(System.getProperty("java.io.tmpdir"));
+Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
+
+// Add ServletContainerInitializer
+Bug51376SCI sci = new Bug51376SCI();
+ctx.addServletContainerInitializer(sci, null);
+
+// Start the context
+tomcat.start();
+
+// Stop the context
+ctx.stop();
+
+// Make sure that init() and destroy() were called correctly
+assertTrue(sci.getServlet().isOk());
+}
+
+public static final class Bug51376SCI
+implements ServletContainerInitializer {
+
+private Bug51376Servlet s = null;
+
+private Bug51376Servlet getServlet() {
+return s;
+}
+
+@Override
+public void onStartup(Set> c, ServletContext ctx)
+throws ServletException {
+// Register and map servlet
+s = new Bug51376Servlet();
+ServletRegistration.Dynamic sr = ctx.addServlet("bug51376", s);
+sr.addMapping("/bug51376");
+sr.setLoadOnStartup(1);
+}
+}
+
+public static final class Bug51376Servlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+private Boolean initOk = null;
+private Boolean destoryOk = null;
+
+@Override
+public void init() {
+if (initOk == null && destoryOk == null) {
+initOk = Boolean.TRUE;
+} else {
+initOk = Boolean.FALSE;
+}
+}
+
+@Override
+public void destroy() {
+if (initOk.booleanValue() && destoryOk == null) {
+destoryOk = Boolean.TRUE;
+} else {
+destoryOk = Boolean.FALSE;
+}
+}
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setContentType("text/plain");
+resp.getWriter().write("OK");
+}
+
+protected boolean isOk() {
+if (initOk != null && initOk.booleanValue() && destoryOk != null &&
+destoryOk.booleanValue()) {
+return true;
+} else {
+return false;
+}
+}
+}
+
/**
* Test case for bug 49711: HttpServletRequest.getParts does not work
* in a filter.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1136028&r1=1136027&r2=1136028&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 15 13:21:16 2011
@@ -45,6 +45,12 @@
+
+51376: When adding a Servlet via
+ServletContext#addServlet(String, Servlet), the Servlet w
DO NOT REPLY [Bug 51376] Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc
https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-06-15 13:21:19 UTC --- Fixed in 7.0.x and will be included in 7.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50677] Allow system property variables in catalina.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=50677 --- Comment #4 from Konstantin Kolinko 2011-06-15 13:28:20 UTC --- One more discussion at users@: http://tomcat.markmail.org/thread/4hjo26xeqcuixyw4 "tomcat 7: common.loader property in catalina.properties does not take ANT style variable" -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
svn commit: r1136043 - in /tomcat/trunk: java/org/apache/catalina/startup/Bootstrap.java webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Jun 15 13:51:03 2011
New Revision: 1136043
URL: http://svn.apache.org/viewvc?rev=1136043&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50677
Allow ANT style variables in the common.loader and other *.loader properties in
conf/catalina.properties
I do not implement the substitution for any property as suggested by BZ 50677,
but only for the class loader ones. I think this is sufficient for the use case
and does not break backwards compatibility.
Most of the code is copied from ClassLoaderLogManager.replace().
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1136043&r1=1136042&r2=1136043&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Wed Jun 15
13:51:03 2011
@@ -59,12 +59,6 @@ public final class Bootstrap {
private static final Log log = LogFactory.getLog(Bootstrap.class);
-// -- Constants
-
-
-protected static final String CATALINA_HOME_TOKEN = "${" +
Globals.CATALINA_HOME_PROP + "}";
-protected static final String CATALINA_BASE_TOKEN = "${" +
Globals.CATALINA_BASE_PROP + "}";
-
// --- Static Variables
@@ -116,38 +110,16 @@ public final class Bootstrap {
if ((value == null) || (value.equals("")))
return parent;
+value = replace(value);
+
List repositories = new ArrayList();
-int i;
StringTokenizer tokenizer = new StringTokenizer(value, ",");
while (tokenizer.hasMoreElements()) {
-String repository = tokenizer.nextToken();
-
-// Local repository
-boolean replace = false;
-String before = repository;
-while ((i=repository.indexOf(CATALINA_HOME_TOKEN))>=0) {
-replace=true;
-if (i>0) {
-repository = repository.substring(0,i) + getCatalinaHome()
-+ repository.substring(i+CATALINA_HOME_TOKEN.length());
-} else {
-repository = getCatalinaHome()
-+ repository.substring(CATALINA_HOME_TOKEN.length());
-}
-}
-while ((i=repository.indexOf(CATALINA_BASE_TOKEN))>=0) {
-replace=true;
-if (i>0) {
-repository = repository.substring(0,i) + getCatalinaBase()
-+ repository.substring(i+CATALINA_BASE_TOKEN.length());
-} else {
-repository = getCatalinaBase()
-+ repository.substring(CATALINA_BASE_TOKEN.length());
-}
+String repository = tokenizer.nextToken().trim();
+if (repository.length() == 0) {
+continue;
}
-if (replace && log.isDebugEnabled())
-log.debug("Expanded " + before + " to " + repository);
// Check for a JAR URL repository
try {
@@ -159,6 +131,7 @@ public final class Bootstrap {
// Ignore
}
+// Local repository
if (repository.endsWith("*.jar")) {
repository = repository.substring
(0, repository.length() - "*.jar".length());
@@ -193,6 +166,51 @@ public final class Bootstrap {
}
+/**
+ * System property replacement in the given string.
+ *
+ * @param str The original string
+ * @return the modified string
+ */
+protected String replace(String str) {
+// Implementation is copied from ClassLoaderLogManager.replace(),
+// but added special processing for catalina.home and catalina.base.
+String result = str;
+int pos_start = str.indexOf("${");
+if (pos_start >= 0) {
+StringBuilder builder = new StringBuilder();
+int pos_end = -1;
+while (pos_start >= 0) {
+builder.append(str, pos_end + 1, pos_start);
+pos_end = str.indexOf('}', pos_start + 2);
+if (pos_end < 0) {
+pos_end = pos_start - 1;
+break;
+}
+String propName = str.substring(pos_start + 2, pos_end);
+String replacement;
+if (propName.length() == 0) {
+replacement = null;
+} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+replacement = getCatalinaHome();
+} else if (Globals.CATALI
DO NOT REPLY [Bug 50677] Allow system property variables in catalina.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=50677 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Konstantin Kolinko 2011-06-15 14:00:38 UTC --- I implemented the substitution in r1136043 and it will be in 7.0.17. I used a different approach to the one proposed above: I implement substitution for the *.loader properties only. This is the use case that was discussed here and on users@. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
svn commit: r1136070 - /tomcat/trunk/conf/catalina.properties
Author: kkolinko Date: Wed Jun 15 14:32:08 2011 New Revision: 1136070 URL: http://svn.apache.org/viewvc?rev=1136070&view=rev Log: Add sunmscapi.jar to jarsToSkip I found it in version 6u25 of Oracle JDK and JRE on Windows 32-bit. Modified: tomcat/trunk/conf/catalina.properties Modified: tomcat/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1136070&r1=1136069&r2=1136070&view=diff == --- tomcat/trunk/conf/catalina.properties (original) +++ tomcat/trunk/conf/catalina.properties Wed Jun 15 14:32:08 2011 @@ -101,7 +101,8 @@ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\ ant.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\ jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\ xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\ -dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunpkcs11.jar,tools.jar,\ +dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunmscapi.jar,\ +sunpkcs11.jar,tools.jar,\ apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\ j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\ mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136073 - in /tomcat/trunk: conf/logging.properties java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Jun 15 14:48:11 2011
New Revision: 1136073
URL: http://svn.apache.org/viewvc?rev=1136073&view=rev
Log:
Add to the logging.properties file a sample configuration setting
for enabling debug messages in TldLocationsCache.
Slightly improve the messages printed by TldLocationsCache.
Modified:
tomcat/trunk/conf/logging.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/conf/logging.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/logging.properties?rev=1136073&r1=1136072&r2=1136073&view=diff
==
--- tomcat/trunk/conf/logging.properties (original)
+++ tomcat/trunk/conf/logging.properties Wed Jun 15 14:48:11 2011
@@ -59,3 +59,6 @@ org.apache.catalina.core.ContainerBase.[
# For example, set the org.apache.catalina.util.LifecycleBase logger to log
# each component that extends LifecycleBase changing state:
#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1136073&r1=1136072&r2=1136073&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Jun 15 14:48:11 2011
@@ -490,5 +490,5 @@ jsp.message.jsp_unload_check=Checking JS
xmlParser.skipBomFail=Failed to skip BOM when parsing XML input stream
-jsp.tldCache.noTldInJar=No TLD files were found in [{0}]. Consider adding the
JAR to to the tomcat.util.scan.DefaultJarScanner.jarsToSkip in
CATALINA_BASE/catalina.properties
-jsp.tldCache.noTldSummary=At least one JAR was scanned for TLDs yet contained
no TLDs. Enable debug logging for this logger for a complete list of JARs that
were scanned where no TLDs were found. Skipping JAR scanning can improve
startup time and JSP compilation time.
\ No newline at end of file
+jsp.tldCache.noTldInJar=No TLD files were found in [{0}]. Consider adding the
JAR to the tomcat.util.scan.DefaultJarScanner.jarsToSkip property in
CATALINA_BASE/conf/catalina.properties file.
+jsp.tldCache.noTldSummary=At least one JAR was scanned for TLDs yet contained
no TLDs. Enable debug logging for this logger for a complete list of JARs that
were scanned but no TLDs were found in them. Skipping unneeded JARs during
scanning can improve startup time and JSP compilation time.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1136073&r1=1136072&r2=1136073&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 15 14:48:11 2011
@@ -75,6 +75,14 @@
+
+
+
+Improve the message printed by TldLocationsCache and add configuration
+example to the logging.properties file. (kkolinko)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51376] Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc
https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 Artem Troitskiy changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #4 from Artem Troitskiy 2011-06-15 14:50:26 UTC --- (In reply to comment #3) > Fixed in 7.0.x and will be included in 7.0.17 onwards. This one is still unresolved: * destroy() can be called on non-initialized servlet If servlet added via addServlet(String, Servlet) without setLoadOnStartup() was never accessed, its destroy() method is called during shutdown despite the fact that init() was never called. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51379] New: The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression)
https://issues.apache.org/bugzilla/show_bug.cgi?id=51379 Bug #: 51379 Summary: The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression) Product: Tomcat 6 Version: 6.0.14 Platform: PC OS/Version: Windows XP Status: NEW Severity: blocker Priority: P2 Component: Servlet & JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: kallol.chaudh...@tcs.com Classification: Unclassified I developed a JSF project using eclipse 3.4.1 and Apache Tomcat 6.0.14. Here I am trying to access the MySQL database table having one single column and display the value of that column in the JSP page using h:dataTable. It is giving the error 'The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression)'. The jsp file is data.jsp. The complete stack trace is :- An error occurred at line: 9 in the jsp file: /data.jsp The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression) 6: 7: 8: 9: 10: 11: 12: Stacktrace: at org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:92) at org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:330) at org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:423) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:308) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:286) at org.apache.jasper.compiler.Compiler.compile(Compiler.java:273) at org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:566) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:317) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:320) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:266) at javax.servlet.http.HttpServlet.service(HttpServlet.java:803) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:654) at org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:445) at org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:379) at org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:292) at com.sun.faces.context.ExternalContextImpl.dispatch(ExternalContextImpl.java:414) at com.sun.faces.application.ViewHandlerImpl.executePageToBuildView(ViewHandlerImpl.java:455) at com.sun.faces.application.ViewHandlerImpl.renderView(ViewHandlerImpl.java:139) at com.sun.faces.lifecycle.RenderResponsePhase.execute(RenderResponsePhase.java:108) at com.sun.faces.lifecycle.LifecycleImpl.phase(LifecycleImpl.java:266) ... 14 more -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51379] The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression)
https://issues.apache.org/bugzilla/show_bug.cgi?id=51379 --- Comment #1 from Kallol 2011-06-15 15:03:58 UTC --- Created attachment 27160 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27160 This is the test project developed using eclipse 3.4 and Apache Tomcat 6.0.14 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
svn commit: r1136090 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpAprProtocol.java
Author: markt
Date: Wed Jun 15 15:43:53 2011
New Revision: 1136090
URL: http://svn.apache.org/viewvc?rev=1136090&view=rev
Log:
Align code between connectors in preparation for pulling code up to the
superclass
No need to pass the socket into the asyncDispatch() call. It will always have
been set beforehand.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1136090&r1=1136089&r2=1136090&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Jun 15
15:43:53 2011
@@ -333,11 +333,7 @@ public class AjpAprProcessor extends Abs
}
-public SocketState asyncDispatch(SocketWrapper socket,
-SocketStatus status) {
-
-// Setting up the socket
-this.socket = socket;
+public SocketState asyncDispatch(SocketStatus status) {
RequestInfo rp = request.getRequestProcessor();
try {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1136090&r1=1136089&r2=1136090&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun 15
15:43:53 2011
@@ -192,7 +192,7 @@ public class AjpAprProtocol extends Abst
if (processor != null) {
// Call the appropriate event
try {
-state = processor.asyncDispatch(socket, status);
+state = processor.asyncDispatch(status);
}
// Future developers: if you discover any other
// rare-but-nonfatal exceptions, catch them here, and log as
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136091 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpNioProcessor.java AjpProcessor.java
Author: markt
Date: Wed Jun 15 15:46:54 2011
New Revision: 1136091
URL: http://svn.apache.org/viewvc?rev=1136091&view=rev
Log:
Align code between connectors in preparation for pulling code up to the
superclass
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1136091&r1=1136090&r2=1136091&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Jun 15
15:46:54 2011
@@ -351,18 +351,17 @@ public class AjpNioProcessor extends Abs
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
+if (error) {
+response.setStatus(500);
+}
if (isAsync()) {
if (error) {
-response.setStatus(500);
request.updateCounters();
return SocketState.CLOSED;
} else {
return SocketState.LONG;
}
} else {
-if (error) {
-response.setStatus(500);
-}
request.updateCounters();
return SocketState.CLOSED;
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1136091&r1=1136090&r2=1136091&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jun 15
15:46:54 2011
@@ -358,9 +358,11 @@ public class AjpProcessor extends Abstra
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
+if (error) {
+response.setStatus(500);
+}
if (isAsync()) {
if (error) {
-response.setStatus(500);
request.updateCounters();
input = null;
output = null;
@@ -369,9 +371,6 @@ public class AjpProcessor extends Abstra
return SocketState.LONG;
}
} else {
-if (error) {
-response.setStatus(500);
-}
request.updateCounters();
input = null;
output = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136099 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Author: markt
Date: Wed Jun 15 15:56:59 2011
New Revision: 1136099
URL: http://svn.apache.org/viewvc?rev=1136099&view=rev
Log:
Align code between connectors in preparation for pulling code up to the
superclass
When returning SocketState.CLOSED, recycle is always called
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1136099&r1=1136098&r2=1136099&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jun 15
15:56:59 2011
@@ -364,23 +364,24 @@ public class AjpProcessor extends Abstra
if (isAsync()) {
if (error) {
request.updateCounters();
-input = null;
-output = null;
return SocketState.CLOSED;
} else {
return SocketState.LONG;
}
} else {
request.updateCounters();
-input = null;
-output = null;
return SocketState.CLOSED;
}
-
-
}
+@Override
+public void recycle() {
+super.recycle();
+input = null;
+output = null;
+}
+
// - ActionHook Methods
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.16
On Sat, Jun 11, 2011 at 7:33 AM, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.16 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.16/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_16/ > > The proposed 7.0.16 release is: > > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 7.0.16 Alpha > [ ] Beta - go ahead and release as 7.0.16 Beta > [ X ] Stable - go ahead and release as 7.0.16 Stable I've only done basic smoke tests, no TCK. Yoav > > Cheers, > > Mark > > > > - > 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
Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
On 15.06.2011 14:49, Mark Thomas wrote: > On 15/06/2011 13:29, Konstantin Kolinko wrote: >> The failure happened in >> [junit] Test org.apache.catalina.core.TestAsyncContextImpl FAILED >> >> when running with NIO. Running the same test with BIO was OK. The log >> file from the test is [1]. >> >> [1]: >> http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.core.TestAsyncContextImpl.NIO.txt.html >> >> The failure there: >> >> Testcase: testListeners took 6.23 sec >> FAILED >> Uri: /stage1, Status: 200, Time: 4999 >> junit.framework.AssertionFailedError: Uri: /stage1, Status: 200, Time: 4999 >> at >> org.apache.catalina.core.TestAsyncContextImpl.validateAccessLog(TestAsyncContextImpl.java:1052) >> at >> org.apache.catalina.core.TestAsyncContextImpl.testListeners(TestAsyncContextImpl.java:628) > > Looks like a timing issue with the AccessLog tests. These work for me > when running locally. I'm tempted to leave the timings as is for now and > see if we get regular failures. If we do, we can increase the margins. So at least it is not only me with my exotic systems seeing a few test failures every now and then. I noticed a similar failure when testing 7.0.14: > Testcase: testAsyncStartNoComplete took 4.289 sec > »···FAILED > Uri: /, Status: 200, Time: 998 > junit.framework.AssertionFailedError: Uri: /, Status: 200, Time: 998 > »···at > org.apache.catalina.core.TestAsyncContextImpl.validateAccessLog(TestAsyncContextImpl.java:1049) > > »···at > org.apache.catalina.core.TestAsyncContextImpl.testAsyncStartNoComplete(TestAsyncContextImpl.java:162) It turned out, the expectation was a request duration of 1000ms, and the access log contained a duration of 998ms. It only happens spordically for me, I neither oberved it during 7.0.15 tests, nor for 7.0.16. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
On 15.06.2011 14:49, Mark Thomas wrote: > On 15/06/2011 13:29, Konstantin Kolinko wrote: >> The failure happened in >> [junit] Test org.apache.catalina.core.TestAsyncContextImpl FAILED >> >> when running with NIO. Running the same test with BIO was OK. The log >> file from the test is [1]. >> >> [1]: >> http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.core.TestAsyncContextImpl.NIO.txt.html >> >> The failure there: >> >> Testcase: testListeners took 6.23 sec >> FAILED >> Uri: /stage1, Status: 200, Time: 4999 >> junit.framework.AssertionFailedError: Uri: /stage1, Status: 200, Time: 4999 >> at >> org.apache.catalina.core.TestAsyncContextImpl.validateAccessLog(TestAsyncContextImpl.java:1052) >> at >> org.apache.catalina.core.TestAsyncContextImpl.testListeners(TestAsyncContextImpl.java:628) > > Looks like a timing issue with the AccessLog tests. These work for me > when running locally. I'm tempted to leave the timings as is for now and > see if we get regular failures. If we do, we can increase the margins. So at least it is not only me with my exotic systems seeing a few test failures every now and then. I noticed a similar failure when testing 7.0.14: > Testcase: testAsyncStartNoComplete took 4.289 sec > »···FAILED > Uri: /, Status: 200, Time: 998 > junit.framework.AssertionFailedError: Uri: /, Status: 200, Time: 998 > »···at > org.apache.catalina.core.TestAsyncContextImpl.validateAccessLog(TestAsyncContextImpl.java:1049) > > »···at > org.apache.catalina.core.TestAsyncContextImpl.testAsyncStartNoComplete(TestAsyncContextImpl.java:162) It turned out, the expectation was a request duration of 1000ms, and the access log contained a duration of 998ms. It only happens spordically for me, I neither oberved it during 7.0.15 tests, nor for 7.0.16. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136106 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpNioProcessor.java AjpProcessor.java
Author: markt
Date: Wed Jun 15 16:19:06 2011
New Revision: 1136106
URL: http://svn.apache.org/viewvc?rev=1136106&view=rev
Log:
Align code between connectors in preparation for pulling code up to the
superclass
No need to close the AJP connection if there was no error
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1136106&r1=1136105&r2=1136106&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Jun 15
16:19:06 2011
@@ -363,7 +363,11 @@ public class AjpNioProcessor extends Abs
}
} else {
request.updateCounters();
-return SocketState.CLOSED;
+if (error) {
+return SocketState.CLOSED;
+} else {
+return SocketState.OPEN;
+}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1136106&r1=1136105&r2=1136106&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jun 15
16:19:06 2011
@@ -370,7 +370,11 @@ public class AjpProcessor extends Abstra
}
} else {
request.updateCounters();
-return SocketState.CLOSED;
+if (error) {
+return SocketState.CLOSED;
+} else {
+return SocketState.OPEN;
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136108 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProcessor.java AjpAprProcessor.java AjpNioProcessor.java AjpProcessor.java
Author: markt
Date: Wed Jun 15 16:24:42 2011
New Revision: 1136108
URL: http://svn.apache.org/viewvc?rev=1136108&view=rev
Log:
Pull up asyncDispatch()
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1136108&r1=1136107&r2=1136108&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Jun
15 16:24:42 2011
@@ -19,6 +19,7 @@ package org.apache.coyote.ajp;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InterruptedIOException;
import java.net.InetAddress;
import java.security.NoSuchProviderException;
import java.security.cert.CertificateFactory;
@@ -32,7 +33,9 @@ import org.apache.coyote.AsyncContextCal
import org.apache.coyote.AsyncStateMachine;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
+import org.apache.coyote.RequestInfo;
import org.apache.juli.logging.Log;
+import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.HexUtils;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -40,6 +43,7 @@ import org.apache.tomcat.util.http.HttpM
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -375,6 +379,46 @@ public abstract class AbstractAjpProcess
protected abstract void finish() throws IOException;
+ public SocketState asyncDispatch(SocketStatus status) {
+
+ RequestInfo rp = request.getRequestProcessor();
+ try {
+ rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
+ error = !adapter.asyncDispatch(request, response, status);
+ } catch (InterruptedIOException e) {
+ error = true;
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ getLog().error(sm.getString("http11processor.request.process"), t);
+ // 500 - Internal Server Error
+ response.setStatus(500);
+ adapter.log(request, response, 0);
+ error = true;
+ }
+
+ rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
+
+ if (error) {
+ response.setStatus(500);
+ }
+ if (isAsync()) {
+ if (error) {
+ request.updateCounters();
+ return SocketState.CLOSED;
+ } else {
+ return SocketState.LONG;
+ }
+ } else {
+ request.updateCounters();
+ if (error) {
+ return SocketState.CLOSED;
+ } else {
+ return SocketState.OPEN;
+ }
+ }
+ }
+
+
public void recycle() {
asyncStateMachine.recycle();
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1136108&r1=1136107&r2=1136108&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Jun 15
16:24:42 2011
@@ -333,47 +333,6 @@ public class AjpAprProcessor extends Abs
}
-public SocketState asyncDispatch(SocketStatus status) {
-
-RequestInfo rp = request.getRequestProcessor();
-try {
-rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
-error = !adapter.asyncDispatch(request, response, status);
-} catch (InterruptedIOException e) {
-error = true;
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("http11processor.request.process"), t);
-// 500 - Internal Server Error
-response.setStatus(500);
-adapter.log(request, response, 0);
-error = true;
-}
-
-rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-
-if (error) {
-response.setStatus(500);
-}
-if (isAsync()) {
-if (error) {
-request.updateCounters();
-return SocketState.CLOSED;
-} else {
-return SocketState.LONG;
-}
-} else {
-request.updateCounte
Testfailures in Tomcat 7
Hi, I'm Christoph, a java developer from cologne, germany. I had a little free time and checked out the tomcat trunk. I want to look at the code and maybe use my further free time to do some bugfixes to contribute. So the ant build runs fine and I integrated the sources in eclipse. But when I execute the tests in test folder I get about 17 failures and 6 errors. Maybe I missed something or run to much tests? (521 runs). Can anybody give me a hint for a kickstart? Thanks, Christoph
Re: Crash in APR when pausing endpoint
Rainer, On 6/13/2011 11:49 AM, Mark Thomas wrote: > Analysis and patch make sense to me. +1 Nice analysis. Nice to see I'm not the only one who can code-up a nice race condition. -chris signature.asc Description: OpenPGP digital signature
Re: Testfailures in Tomcat 7
On 15/06/2011 21:11, Christoph Pater wrote: > Hi, > I'm Christoph, a java developer from cologne, germany. > > I had a little free time and checked out the tomcat trunk. I want to look at > the code and maybe use my further free time to do some bugfixes to > contribute. > > So the ant build runs fine and I integrated the sources in eclipse. But when > I execute the tests in test folder I get about 17 failures and 6 errors. > > Maybe I missed something or run to much tests? (521 runs). > > Can anybody give me a hint for a kickstart? ant clean test should be all you need. If you look in the build.xml file you'll see some tests are excluded. You may also want to configure the tests to run with the APR connector which will require a little more configuration. All the info you need is in the build.xml file. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1136179 - in /tomcat/trunk: java/org/apache/catalina/core/StandardWrapper.java test/org/apache/catalina/core/TestStandardContext.java
Author: markt
Date: Wed Jun 15 20:32:14 2011
New Revision: 1136179
URL: http://svn.apache.org/viewvc?rev=1136179&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51376
Complete fix. Ensure Servlet.destroy() is only called if Servlet.init() was
called.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1136179&r1=1136178&r2=1136179&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Jun 15
20:32:14 2011
@@ -1375,53 +1375,55 @@ public class StandardWrapper extends Con
}
}
-PrintStream out = System.out;
-if (swallowOutput) {
-SystemLogHandler.startCapture();
-}
-
-// Call the servlet destroy() method
-try {
-instanceSupport.fireInstanceEvent
- (InstanceEvent.BEFORE_DESTROY_EVENT, instance);
-
-if( Globals.IS_SECURITY_ENABLED) {
-SecurityUtil.doAsPrivilege("destroy",
- instance);
-SecurityUtil.remove(instance);
-} else {
-instance.destroy();
-}
-
-instanceSupport.fireInstanceEvent
- (InstanceEvent.AFTER_DESTROY_EVENT, instance);
-
-// Annotation processing
-if (!((Context) getParent()).getIgnoreAnnotations()) {
-
((StandardContext)getParent()).getInstanceManager().destroyInstance(instance);
-}
-
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-instanceSupport.fireInstanceEvent
- (InstanceEvent.AFTER_DESTROY_EVENT, instance, t);
-instance = null;
-instancePool = null;
-nInstances = 0;
-fireContainerEvent("unload", this);
-unloading = false;
-throw new ServletException
-(sm.getString("standardWrapper.destroyException", getName()),
- t);
-} finally {
-// Write captured output
+if (instanceInitialized) {
+PrintStream out = System.out;
if (swallowOutput) {
-String log = SystemLogHandler.stopCapture();
-if (log != null && log.length() > 0) {
-if (getServletContext() != null) {
-getServletContext().log(log);
-} else {
-out.println(log);
+SystemLogHandler.startCapture();
+}
+
+// Call the servlet destroy() method
+try {
+instanceSupport.fireInstanceEvent
+ (InstanceEvent.BEFORE_DESTROY_EVENT, instance);
+
+if( Globals.IS_SECURITY_ENABLED) {
+SecurityUtil.doAsPrivilege("destroy",
+ instance);
+SecurityUtil.remove(instance);
+} else {
+instance.destroy();
+}
+
+instanceSupport.fireInstanceEvent
+ (InstanceEvent.AFTER_DESTROY_EVENT, instance);
+
+// Annotation processing
+if (!((Context) getParent()).getIgnoreAnnotations()) {
+
((StandardContext)getParent()).getInstanceManager().destroyInstance(instance);
+}
+
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+instanceSupport.fireInstanceEvent
+ (InstanceEvent.AFTER_DESTROY_EVENT, instance, t);
+instance = null;
+instancePool = null;
+nInstances = 0;
+fireContainerEvent("unload", this);
+unloading = false;
+throw new ServletException
+(sm.getString("standardWrapper.destroyException",
getName()),
+ t);
+} finally {
+// Write captured output
+if (swallowOutput) {
+String log = SystemLogHandler.stopCapture();
+if (log != null && log.length() > 0) {
+if (getServletContext() != null) {
+getServletContext().log(log);
+} else {
+out.println(log);
+}
}
}
}
Modified: tomcat/trunk/te
DO NOT REPLY [Bug 51376] Dynamically added Servlet instances ignore setLoadOnStartup(), @ServletSecurity, etc
https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2011-06-15 20:32:36 UTC --- Thanks for the catch. Fixed in 7.0.x and will be in 7.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51379] The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression)
https://issues.apache.org/bugzilla/show_bug.cgi?id=51379 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas 2011-06-15 20:35:29 UTC --- Bugzilla is not a support forum. Please use the Tomcat user's mailing list. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51382] New: Link to download pages are broken
https://issues.apache.org/bugzilla/show_bug.cgi?id=51382 Bug #: 51382 Summary: Link to download pages are broken Product: Taglibs Version: unspecified Platform: PC Status: NEW Severity: major Priority: P2 Component: Application Taglib AssignedTo: dev@tomcat.apache.org ReportedBy: colbert.phili...@rogers.com Classification: Unclassified As of today (June 15 2011), the links to the download pages of the Zip archive format are broken so there is no way to download the library. http://tomcat.apache.org/taglibs/standard/ http://jakarta.apache.org/site/downloads/downloads_taglibs-standard.cgi -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 41539] NullPointerException during Embedded tomcat restart
https://issues.apache.org/bugzilla/show_bug.cgi?id=41539 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||WONTFIX --- Comment #4 from Mark Thomas 2011-06-15 21:35:53 UTC --- This isn't going to be fixed for the 5.5.x branch but the new o.a.c.startup.Tomcat class in 7.0.x should be able to handle this. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 43538] [patch] Show the hostname and IP address in the manager webapp
https://issues.apache.org/bugzilla/show_bug.cgi?id=43538 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2011-06-15 21:58:01 UTC --- It took rather a long time but this has been applied to 7.0.x and will be included in 7.0.17 onwards. I don't see this being back-ported to 6.0.x or 5.5.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
svn commit: r1136216 - in /tomcat/trunk: java/org/apache/catalina/manager/ webapps/docs/
Author: markt
Date: Wed Jun 15 21:58:00 2011
New Revision: 1136216
URL: http://svn.apache.org/viewvc?rev=1136216&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43538
Add host name and IP address to the HTML Manager application.
Patch by Dennis Lundberg.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1136216&r1=1136215&r2=1136216&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Wed Jun 15
21:58:00 2011
@@ -170,7 +170,7 @@ public class Constants {
SERVER_HEADER_SECTION =
"\n" +
"\n" +
-" {0}\n" +
+" {0}\n" +
"\n" +
"\n" +
" {1}\n" +
@@ -179,6 +179,8 @@ public class Constants {
" {4}\n" +
" {5}\n" +
" {6}\n" +
+" {7}\n" +
+" {8}\n" +
"\n";
SERVER_ROW_SECTION =
@@ -189,6 +191,8 @@ public class Constants {
" {3}\n" +
" {4}\n" +
" {5}\n" +
+" {6}\n" +
+" {7}\n" +
"\n" +
"\n" +
"\n" +
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1136216&r1=1136215&r2=1136216&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Jun 15 21:58:00 2011
@@ -22,6 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -630,7 +632,7 @@ public final class HTMLManagerServlet ex
writer.print(MessageFormat.format(DIAGNOSTICS_SECTION, args));
// Server Header Section
-args = new Object[7];
+args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.serverTitle");
args[1] = smClient.getString("htmlManagerServlet.serverVersion");
args[2] = smClient.getString("htmlManagerServlet.serverJVMVersion");
@@ -638,17 +640,27 @@ public final class HTMLManagerServlet ex
args[4] = smClient.getString("htmlManagerServlet.serverOSName");
args[5] = smClient.getString("htmlManagerServlet.serverOSVersion");
args[6] = smClient.getString("htmlManagerServlet.serverOSArch");
+args[7] = sm.getString("htmlManagerServlet.serverHostname");
+args[8] = sm.getString("htmlManagerServlet.serverIPAddress");
writer.print(MessageFormat.format
(Constants.SERVER_HEADER_SECTION, args));
// Server Row Section
-args = new Object[6];
+args = new Object[8];
args[0] = ServerInfo.getServerInfo();
args[1] = System.getProperty("java.runtime.version");
args[2] = System.getProperty("java.vm.vendor");
args[3] = System.getProperty("os.name");
args[4] = System.getProperty("os.version");
args[5] = System.getProperty("os.arch");
+try {
+InetAddress address = InetAddress.getLocalHost();
+args[6] = address.getHostName();
+args[7] = address.getHostAddress();
+} catch (UnknownHostException e) {
+args[6] = "-";
+args[7] = "-";
+}
writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
// HTML Tail Section
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1136216&r1=1136215&r2=1136216&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Wed
Jun 15 21:58:00 2011
@@ -58,6 +58,8 @@ htmlManagerServlet.list=List Application
htmlManagerServlet.manager=Manager
htmlManagerServlet.messageLabel=Message:
htmlManagerServlet.noManager
DO NOT REPLY [Bug 48956] SSI regular expressions not working
https://issues.apache.org/bugzilla/show_bug.cgi?id=48956 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2011-06-15 22:43:30 UTC --- Fixed in 7.0.x and will be included in 7.0.17 onwards. I don't see this being back-ported to 6.0.x or 5.5.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
svn commit: r1136231 - in /tomcat/trunk: java/org/apache/catalina/ssi/ExpressionParseTree.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jun 15 22:44:00 2011
New Revision: 1136231
URL: http://svn.apache.org/viewvc?rev=1136231&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48956
Implement regular expression support for SSI
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1136231&r1=1136230&r2=1136231&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Wed Jun
15 22:44:00 2011
@@ -20,6 +20,7 @@ package org.apache.catalina.ssi;
import java.text.ParseException;
import java.util.LinkedList;
import java.util.List;
+import java.util.regex.Pattern;
/**
* Represents a parsed expression.
*
@@ -350,6 +351,21 @@ public class ExpressionParseTree {
protected int compareBranches() {
String val1 = ((StringNode)left).getValue();
String val2 = ((StringNode)right).getValue();
+
+int val2Len = val2.length();
+if (val2Len > 1 && val2.charAt(0) == '/' &&
+val2.charAt(val2Len - 1) == '/') {
+// Treat as a regular expression
+String expr = val2.substring(1, val2Len - 1);
+Pattern pattern = Pattern.compile(expr);
+// Regular expressions will only ever be used with EqualNode
+// so return zero for equal and non-zero for not equal
+if (pattern.matcher(val1).find()) {
+return 0;
+} else {
+return -1;
+}
+}
return val1.compareTo(val2);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1136231&r1=1136230&r2=1136231&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 15 22:44:00 2011
@@ -46,6 +46,9 @@
+48956: Add regular expression support for SSI. (markt)
+
+
50677: Allow system property variables to be used in the
values of "common.loader" and other "*.loader" properties in the
catalina.properties file. (kkolinko)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51379] The method setVar(String) in the type DataTableTag is not applicable for the arguments (JspValueExpression)
https://issues.apache.org/bugzilla/show_bug.cgi?id=51379 --- Comment #3 from Kallol 2011-06-16 04:50:18 UTC --- I wanted to report this as a bug only for eclipse 3.4 and Tomcat 6.0.14. There are several such similar issues raised by other people for which there have been NO solution reported so far. Hope you will reply to this. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
Embedding Tomcat 7 in Apache OFBiz
Hi all,
I'm one of the Apache OFBiz committer and I'm trying to migrate our embedded
version of Tomcat 6 to 7 and I have discover a small issue when try to do this
code:
StandardWrapper defaultServlet = new StandardWrapper();
defaultServlet.setServletClass("org.apache.catalina.servlets.DefaultServlet");
defaultServlet.setServletName("default");
defaultServlet.setLoadOnStartup(1);
defaultServlet.addInitParameter("debug", "0");
defaultServlet.addInitParameter("listing", "true");
defaultServlet.addMapping("/");
I'll receive an NullPointerException on org.apache.catalina.core.
StandardWrapper.addMapping(StandardWrapper.java:755).
Any hint to solve it ?
Thanks
Marco Risaliti
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
