[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (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-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : 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-bio/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/logs-BIO -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO] -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 28 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-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/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wo rkspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150303.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-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.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/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
svn commit: r1663562 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ test/org/apache/catalina/startup/ test/org/ap
Author: markt
Date: Tue Mar 3 09:14:17 2015
New Revision: 1663562
URL: http://svn.apache.org/r1663562
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57621
When an async request completes, need to ensure that any unread input is
swallowed.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1663562r1=1663561r2=1663562view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Tue Mar 3
09:14:17 2015
@@ -107,11 +107,15 @@ public class AsyncContextImpl implements
context.unbind(Globals.IS_SECURITY_ENABLED, oldCL);
}
-// The application doesn't know it has to stop writing until it
receives
-// the complete event so the response has to be closed after firing the
-// event.
+// The application doesn't know it has to stop read and/or writing
until
+// it receives the complete event so the request and response have to
be
+// closed after firing the event.
try {
+// First of all ensure that any data written to the response is
+// written to the I/O layer.
request.getResponse().finishResponse();
+// Close the request and the response.
+request.getCoyoteRequest().action(ActionCode.END_REQUEST, null);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
// Catch this here and allow async context complete to continue
Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1663562r1=1663561r2=1663562view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Tue Mar 3 09:14:17 2015
@@ -228,5 +228,11 @@ public enum ActionCode {
* when the non-blocking listeners are configured on a thread where the
* processing wasn't triggered by a read or write event on the socket.
*/
-DISPATCH_EXECUTE
+DISPATCH_EXECUTE,
+
+/**
+ * Trigger end of request processing (remaining input swallowed, write any
+ * remaining parts of the response etc.).
+ */
+END_REQUEST
}
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=1663562r1=1663561r2=1663562view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Mar 3
09:14:17 2015
@@ -600,6 +600,9 @@ public class AjpProcessor extends Abstra
setErrorState(ErrorState.CLOSE_NOW, null);
break;
}
+case END_REQUEST: {
+// NO-OP for AJP
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1663562r1=1663561r2=1663562view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Mar 3
09:14:17 2015
@@ -974,6 +974,9 @@ public class Http11Processor extends Abs
}
break;
}
+case END_REQUEST: {
+endRequest();
+}
}
}
@@ -1128,22 +1131,12 @@ public class Http11Processor extends Abs
// Finish the handling of the request
rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
-
if (!isAsync()) {
-if (getErrorState().isError()) {
-// If we know we are closing the connection, don't drain
-// input. This way uploading a 100GB file doesn't tie up
the
-// thread if the servlet has rejected it.
-inputBuffer.setSwallowInput(false);
-} else {
-// Need to check this again here in case the response was
-
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #28 from Mark Thomas ma...@apache.org --- (In reply to Francisco A. Lozano from comment #27) Does that address Comment 24 (https://bz.apache.org/bugzilla/show_bug.cgi?id=57251#c24)? Short version: - use unique appBase values per Host - place the WARs outside all appBases - use context.xml files to add apps to a Host - leave unpackWARs as the default of true The new feature will ensure each Host sees any updates to the WARs even if they are made while Tomcat isn't running. If you need any more advice, use the users mailing list. -- 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
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #29 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Mark Thomas from comment #26) Medium to long term I'm thinking about removing the unpackWARs feature and always unpacking into the appBase. I am -1 on removing this feature, as 1) It is a showcase that ServletContext.getRealPath() may return null. 2) Even if we do not fix the slowness, it can be used if there are no jars in the war. E.g. if all jars are elsewhere outside of the webapp (e.g. mapped from external locations via context.xml). -- 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: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
2015-03-03 17:47 GMT+03:00 ma...@apache.org: Author: markt Date: Tue Mar 3 14:47:12 2015 New Revision: 1663715 URL: http://svn.apache.org/r1663715 Log: In directly fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 You meant Indirectly. Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. Note Tomcat does this by setting the last modified time of the expanded directory to the last modified time of the WAR. Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties +// Align the last modified time of the directory with the WAR so +// changes to the WAR while Tomcat is stopped can be detected +docBase.setLastModified(warLastModified); + +// Expand the WAR into the new document base directory 1. The above ordering of setLastModified vs unpacking is wrong. Adding files to the directory while unpacking the war should change its modification time. Your setLastModified call will be invalidated by later changes. 2. I wonder why I do not see any check for directory time stamp in this commit. It only compares time stamps of xml and war files. 3. Generally, I am not sure how well setting modification time of a directory works cross-platform. There may be some edge cases here. I am more used to file modification times. Probably modern OSes are OK, but there may be some issues with drives accessed over network. (Just a guess. I do not have an actual example.) This can be solved by allowing to opt-out from this feature - see 4. below. 4. If you are going to backport this, I think we need to allow to opt out of last modified check on the expanded directory. Setting the date is OK - we are ignoring the boolean return value of that method, checking the date has to be configurable. Use case: The expanded directory is created via some other legacy method. E.g. by unpacking the war by some configuration tool. There may be some legacy scripts doing such unpacking. Maybe chef recipes, maybe RPMs. Personally I would just pack an expanded directory into the RPM, but I do not know what people will be doing. Someone can do unpacking from a script to save time on subsequent Tomcat startup, or if the same appbase is shared by several Tomcat instances. The script may be not smart enough to read timestamp of a file and set timestamp on the directory. (As a future help: touch -r reffile can be used to copy a timestamp from another file). One more example: the war and expanded directory are stored in svn or git. Those do not track time stamps of directories. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57621] RE: Chunked encoding bug in tomcat embedded/spring MVC
https://bz.apache.org/bugzilla/show_bug.cgi?id=57621 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the report. This has been fixed in trunk, 8.0.x (for 8.0.21 onwards) and 7.0.x (for 7.0.60 onwards). Your analysis was heading in the right direction. The block you identified did need to be called but after the AsyncContext has completed. This meant adding a hook so that it could be called from the right place. -- 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-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 57 mins 28 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150303/bin/opens sl -Dexecute.test.apr=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 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-apr : 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-apr/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/logs-APR -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR] -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 26 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-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/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150303/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.te st.nio=false -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 -Dexecute.test.apr=true -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150303.jar -Dtest.temp=output/test-tmp-APR -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-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.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/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
svn commit: r1663567 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ test/org/apache/catalina/startup/
Author: markt Date: Tue Mar 3 09:23:54 2015 New Revision: 1663567 URL: http://svn.apache.org/r1663567 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57621 When an async request completes, need to ensure that any unread input is swallowed. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/ActionCode.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 09:23:54 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
svn commit: r1663607 - in /tomcat/tc7.0.x/trunk/test: javax/servlet/http/TestHttpServlet.java org/apache/catalina/servlets/TestDefaultServlet.java
Author: rjung Date: Tue Mar 3 10:12:40 2015 New Revision: 1663607 URL: http://svn.apache.org/r1663607 Log: No diamonds here. Followup to r1663270 and r1663279. Modified: tomcat/tc7.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Modified: tomcat/tc7.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java?rev=1663607r1=1663606r2=1663607view=diff == --- tomcat/tc7.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java (original) +++ tomcat/tc7.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java Tue Mar 3 10:12:40 2015 @@ -94,7 +94,7 @@ public class TestHttpServlet extends Tom tomcat.start(); -MapString,ListString resHeaders= new HashMap(); +MapString,ListString resHeaders= new HashMapString,ListString(); String path = http://localhost:; + getPort() + /outer; ByteChunk out = new ByteChunk(); Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1663607r1=1663606r2=1663607view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Tue Mar 3 10:12:40 2015 @@ -303,7 +303,7 @@ public class TestDefaultServlet extends tomcat.start(); -MapString,ListString resHeaders= new HashMap(); +MapString,ListString resHeaders= new HashMapString,ListString(); String path = http://localhost:; + getPort() + /test/bug5/bug57601.jsp; ByteChunk out = new ByteChunk(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55479] JSR 196 (JASPIC) support in Tomcat
https://bz.apache.org/bugzilla/show_bug.cgi?id=55479 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- A JIRA ticket to track this as an idea for GSOC 2015 (Google Summer of Code): https://issues.apache.org/jira/browse/COMDEV-116 -- 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
[Tomcat Wiki] Update of RemoveUnpackWARs by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The RemoveUnpackWARs page has been changed by ChristopherSchultz: https://wiki.apache.org/tomcat/RemoveUnpackWARs?action=diffrev1=1rev2=2 The removal of unpackWARs would effectively require the deployment of web applications as exploded directories if the appBase was to remain read-only to the Tomcat user. + An alternative to removing uppackWARs in this case might be to move the location of the unpacked WAR files: the appBase is still the *source* of all WAR data, but unpacked WAR files would be unpacked elsewhere -- such as into the work directory, etc. This would allow a read-only appBase and still allow unpackWARs=true. From a security point of view, the work directory itself is still vulnerable, but it would not be possible (given a pre-existing application or container vulnerability) for an attacker to deploy a completely new WAR onto the container. + + + === Actually read-only filesystem === + If the filesystem is actually read-only (or effectively so, where the effective Tomcat user has no file-write rights whatsoever), then unpackWARs must be true in order to deploy. If all JSPs are pre-compiled and logs are not written to disk, Tomcat should be able to run on a read-only filesystem. === Other use cases === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663754 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java
Author: markt
Date: Tue Mar 3 17:55:04 2015
New Revision: 1663754
URL: http://svn.apache.org/r1663754
Log:
Follow-up to r1663715
- use correct method to get the last modified time of the WAR
- set the directory last modified time after it has been updated
- test the correct files to see if an expanded context.xml file should be used
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1663754r1=1663753r2=1663754view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Tue Mar 3
17:55:04 2015
@@ -84,7 +84,7 @@ public class ExpandWar {
try (JarFile jarFile = juc.getJarFile()) {
// Get the last modified time for the WAR
-long warLastModified = juc.getContentLengthLong();
+long warLastModified = juc.getLastModified();
// Check to see of the WAR has been expanded previously
if (docBase.exists()) {
@@ -99,9 +99,8 @@ public class ExpandWar {
return (docBase.getAbsolutePath());
}
-log.info(sm.getString(expandWar.deleteOld, docBase));
-
// WAR must have been modified. Remove expanded directory.
+log.info(sm.getString(expandWar.deleteOld, docBase));
if (!delete(docBase)) {
throw new
IOException(sm.getString(expandWar.deleteFailed, docBase));
}
@@ -112,10 +111,6 @@ public class ExpandWar {
throw new IOException(sm.getString(expandWar.createFailed,
docBase));
}
-// Align the last modified time of the directory with the WAR so
-// changes to the WAR while Tomcat is stopped can be detected
-docBase.setLastModified(warLastModified);
-
// Expand the WAR into the new document base directory
String canonicalDocBasePrefix = docBase.getCanonicalPath();
if (!canonicalDocBasePrefix.endsWith(File.separator)) {
@@ -161,6 +156,10 @@ public class ExpandWar {
expandedFile.setLastModified(lastModified);
}
}
+
+// Align the last modified time of the directory with the WAR
so
+// changes to the WAR while Tomcat is stopped can be detected
+docBase.setLastModified(warLastModified);
}
success = true;
} catch (IOException e) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663754r1=1663753r2=1663754view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar 3
17:55:04 2015
@@ -793,7 +793,10 @@ public class HostConfig
// should only be used if the directory is not out of date and
// unpackWARs is true. Note the code below may apply further limits
boolean useXml = false;
-if (xml.exists() unpackWARs xml.lastModified() ==
war.lastModified()) {
+File expandedDir = new File(host.getAppBaseFile(), cn.getBaseName());
+// If the xml file exists then expandedDir must exists so no need to
+// test that here
+if (xml.exists() unpackWARs expandedDir.lastModified() ==
war.lastModified()) {
useXml = true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57377] Incorrect use of standard SSL properties for JMX in JMXRemoteLifecycleListener
https://bz.apache.org/bugzilla/show_bug.cgi?id=57377 --- Comment #2 from Mark Thomas ma...@apache.org --- Ping. Is there an ETA for a patch or updated file? -- 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: svn commit: r1662985 - in /tomcat/trunk/test/org/apache/tomcat/util/net: localhost-cert.pem localhost-copy1.jks localhost.jks user1.jks
Rainer, On 2/28/15 1:23 PM, rj...@apache.org wrote: Author: rjung Date: Sat Feb 28 18:23:30 2015 New Revision: 1662985 URL: http://svn.apache.org/r1662985 Log: New certs and key stores. Same private keys, same csrs. Valid until Feb 27th 2017. Why bother with updating these? Two things I can think of to future-proof these: 1. Auto-generate the certs for each run 2. Install a certificate-verifier that ignores validity dates for the cert -chris Modified: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem tomcat/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks tomcat/trunk/test/org/apache/tomcat/util/net/localhost.jks tomcat/trunk/test/org/apache/tomcat/util/net/user1.jks Modified: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem?rev=1662985r1=1662984r2=1662985view=diff == --- tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem Sat Feb 28 18:23:30 2015 @@ -1,12 +1,12 @@ Certificate: Data: Version: 3 (0x2) -Serial Number: 4099 (0x1003) +Serial Number: 4102 (0x1006) Signature Algorithm: sha1WithRSAEncryption Issuer: C=US, CN=ca-test.tomcat.apache.org Validity -Not Before: Feb 28 05:28:42 2013 GMT -Not After : Feb 28 05:28:42 2015 GMT +Not Before: Feb 28 16:57:14 2015 GMT +Not After : Feb 27 16:57:14 2017 GMT Subject: C=US, CN=localhost Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -42,25 +42,25 @@ Certificate: keyid:B0:3B:BC:C9:FA:28:5F:3E:04:1F:9B:6C:C7:8B:68:D8:01:B0:F8:3D Signature Algorithm: sha1WithRSAEncryption - ab:d3:e7:2b:35:d3:6d:9f:87:2a:64:58:f1:61:cb:56:a8:84: - 22:79:ac:0d:68:1f:55:0d:dd:16:16:72:c4:a9:75:2a:0e:f8: - b1:73:68:c9:ee:43:d8:5c:fa:07:5d:3f:41:fb:14:17:be:64: - 21:d8:1e:25:67:92:b2:c5:bb:43:1d:96:b6:d3:bd:1c:e1:a4: - c7:ee:e3:37:0b:92:14:56:ca:ad:a8:76:5b:80:c9:42:8c:89: - f1:42:6e:8c:fb:a1:d7:98:d5:6d:49:99:fe:b6:f6:c6:f3:cc: - 8f:06:54:6e:02:f5:8f:4b:f1:86:ac:14:93:6c:74:25:26:44: - 7a:5b:82:3c:57:d6:e5:14:6e:b7:29:53:e4:40:7a:2f:10:5d: - ff:28:7f:e5:e5:54:6c:38:fa:b9:27:97:2a:69:60:ba:4a:5a: - 28:65:b1:81:e0:b7:a1:74:d6:e6:07:81:6d:b8:59:c3:45:bd: - 7c:a8:17:67:1f:fc:52:1a:6c:90:87:4d:a1:98:51:8c:29:6a: - 84:d9:0d:24:a8:86:6a:5e:6a:b7:f9:27:9b:52:37:96:b5:fd: - 94:11:ca:c4:d9:6d:69:81:fa:96:34:63:3a:7c:49:2d:06:48: - ae:b1:14:59:12:29:8e:59:3d:03:99:42:90:e6:82:df:08:cf: - d7:77:ec:00 + ac:e9:89:a0:fd:83:a7:aa:39:0b:08:f2:89:bc:64:e4:fa:3f: + 7d:7a:5e:6d:79:98:34:31:19:ec:fb:e3:07:2b:ff:ab:2f:58: + 7f:49:33:ca:d1:bb:36:9c:bd:3d:e2:3b:39:e9:a9:c2:b7:9e: + 58:7d:5c:f4:9f:02:80:0b:e2:e2:d8:b8:3a:c0:76:c7:3b:33: + 29:2a:61:02:ac:e0:23:aa:3e:a7:0d:0a:e9:8b:2d:4d:2a:ed: + 59:0c:05:2d:40:86:ed:63:ad:fd:3c:a0:5e:4e:77:a6:f5:fe: + 16:19:e5:bf:66:2f:c0:a3:21:25:65:a8:30:0b:25:9e:b4:67: + ad:9d:7a:33:c2:c7:c0:18:80:ef:f0:ea:1f:33:6b:f5:d6:b6: + 7c:47:8d:99:b5:be:77:cd:61:ba:27:11:a0:8e:19:0f:8b:2d: + 3d:70:ac:44:b3:f7:f5:a1:a7:a9:36:93:89:e4:63:cc:89:50: + ea:cc:c0:5a:c1:a7:41:7b:2f:64:c3:1e:e2:7f:62:72:3a:a1: + d5:9f:8d:83:bf:f4:10:5f:3b:e3:48:fd:2c:7c:55:7f:81:e2: + e3:2f:95:53:67:20:40:97:2a:cf:cf:f2:e0:13:0d:02:fe:9f: + 43:93:01:55:22:5b:d9:b6:fd:a6:55:6c:c8:68:dc:3c:73:e7: + 29:14:78:29 -BEGIN CERTIFICATE- -MIIDSTCCAjGgAwIBAgICEAMwDQYJKoZIhvcNAQEFBQAwMTELMAkGA1UEBhMCVVMx -IjAgBgNVBAMTGWNhLXRlc3QudG9tY2F0LmFwYWNoZS5vcmcwHhcNMTMwMjI4MDUy -ODQyWhcNMTUwMjI4MDUyODQyWjAhMQswCQYDVQQGEwJVUzESMBAGA1UEAxMJbG9j +MIIDSTCCAjGgAwIBAgICEAYwDQYJKoZIhvcNAQEFBQAwMTELMAkGA1UEBhMCVVMx +IjAgBgNVBAMTGWNhLXRlc3QudG9tY2F0LmFwYWNoZS5vcmcwHhcNMTUwMjI4MTY1 +NzE0WhcNMTcwMjI3MTY1NzE0WjAhMQswCQYDVQQGEwJVUzESMBAGA1UEAxMJbG9j YWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5295PxiHkd0n mDQkeVhH+cJpK9hbwOC7SlfWALW7arBmhFy48BIKJycynIIqLw9pd6bpDd9kMVHA QR7c1HRRnKO4URNYc+4hnPljghvCLEnDCXD/qfOvogwLYC9q26UBRT40kI5naetF @@ -70,10 +70,10 @@ KrOf4Wt4DWMaQdVr29hIWQSI0RHV50UoDnwbeHUg iViUaVtwJwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVu U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUMNurcJQ0yv11RqvO 4kqpnnS8abswHwYDVR0jBBgwFoAUsDu8yfooXz4EH5tsx4to2AGw+D0wDQYJKoZI -hvcNAQEFBQADggEBAKvT5ys1022fhypkWPFhy1aohCJ5rA1oH1UN3RYWcsSpdSoO -+LFzaMnuQ9hc+gddP0H7FBe+ZCHYHiVnkrLFu0MdlrbTvRzhpMfu4zcLkhRWyq2o -dluAyUKMifFCboz7odeY1W1Jmf629sbzzI8GVG4C9Y9L8YasFJNsdCUmRHpbgjxX
Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
Chuck, On 3/3/15 1:20 PM, Caldarale, Charles R wrote: From: Mark Thomas [mailto:ma...@apache.org] Subject: Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties A bigger issue is anything writing files into the docBase (e.g. some people write logs here despite it being a bad idea) is going to change the last modified time of the directory. As much as I like the simplicity of this approach, I think an alternative is required. As Konstantin noted, the timestamp on a directory is rather ephemeral, especially on Windows or NAS boxes. Can you simply record the deployment occurrence by writing a file with some appropriately Tomcat-specific name into the chosen deployment directory and set the timestamp on that file to match the .war? Like touching the timestamp of the context.xml file? Or maybe META-INF/context.xml.stamp or whatever. -chris signature.asc Description: OpenPGP digital signature
[Tomcat Wiki] Update of RemoveUnpackWARs by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The RemoveUnpackWARs page has been changed by markt: https://wiki.apache.org/tomcat/RemoveUnpackWARs?action=diffrev1=3rev2=4 === Actually read-only filesystem === If the filesystem is actually read-only (or effectively so, where the effective Tomcat user has no file-write rights whatsoever), then unpackWARs must be false in order to deploy. If all JSPs are pre-compiled and logs are not written to disk, Tomcat should be able to run on a read-only filesystem. + Deploying an exploded WAR file with pre-compiled JSPs would also meet this requirement. + + === Other use cases === Additional use cases welcome. Either directly on this page or via the users mailing list. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
On 03/03/2015 19:14, Christopher Schultz wrote: Chuck, On 3/3/15 1:20 PM, Caldarale, Charles R wrote: From: Mark Thomas [mailto:ma...@apache.org] Subject: Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties A bigger issue is anything writing files into the docBase (e.g. some people write logs here despite it being a bad idea) is going to change the last modified time of the directory. As much as I like the simplicity of this approach, I think an alternative is required. As Konstantin noted, the timestamp on a directory is rather ephemeral, especially on Windows or NAS boxes. Can you simply record the deployment occurrence by writing a file with some appropriately Tomcat-specific name into the chosen deployment directory and set the timestamp on that file to match the .war? Like touching the timestamp of the context.xml file? That can be modified by the user. Or maybe META-INF/context.xml.stamp or whatever. I like that idea. I was thinking about the work directory but having it inside the directory of the expanded WAR simplifies undeployment. I'll probably tweak the file name but I do like the general idea. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663768 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Tue Mar 3 19:36:56 2015
New Revision: 1663768
URL: http://svn.apache.org/r1663768
Log:
Use existing constant
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663768r1=1663767r2=1663768view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar 3
19:36:56 2015
@@ -774,7 +774,7 @@ public class HostConfig
protected void deployWAR(ContextName cn, File war) {
File xml = new File(host.getAppBaseFile(),
-cn.getBaseName() + /META-INF/context.xml);
+cn.getBaseName() + / + Constants.ApplicationContextXml);
boolean xmlInWar = false;
JarEntry entry = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
From: Christopher Schultz [mailto:ch...@christopherschultz.net] Subject: Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties Can you simply record the deployment occurrence by writing a file with some appropriately Tomcat-specific name into the chosen deployment directory and set the timestamp on that file to match the .war? Like touching the timestamp of the context.xml file? Or maybe META-INF/context.xml.stamp or whatever. Better to use a unique file name that's not part of the current webapp configuration. A simple touch is not appropriate, but setting the timestamp to the .war modification time should work. - Chuck - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tests compilation failed (Was: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed)
2015-03-03 22:31 GMT+03:00 Bill Barker billbar...@apache.org: To whom it may engage... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html Tests failed to compile. Apparently final modifier is needed. test-compile: [javac] Compiling 170 source files to /srv/gump/public/workspace/tomcat-8.0.x/output/testclasses [javac] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java:754: error: local variable resp is accessed from within inner class; needs to be declared final [javac] resp.setContentType(text/plain); [javac] ^ [javac] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java:755: error: local variable resp is accessed from within inner class; needs to be declared final [javac] resp.setCharacterEncoding(UTF-8); [javac] ^ [javac] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java:757: error: local variable resp is accessed from within inner class; needs to be declared final [javac] resp.getWriter().print(OK); [javac] ^ [javac] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java:761: error: local variable ac is accessed from within inner class; needs to be declared final [javac] ac.complete(); [javac] ^ [javac] 4 errors BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:1327: Compile failed; see the compiler error output for details. Total time: 33 seconds - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
On 03/03/2015 17:30, Mark Thomas wrote: On 03/03/2015 15:48, Konstantin Kolinko wrote: 2015-03-03 17:47 GMT+03:00 ma...@apache.org: Author: markt Date: Tue Mar 3 14:47:12 2015 New Revision: 1663715 URL: http://svn.apache.org/r1663715 Log: In directly fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 You meant Indirectly. I did. 1. The above ordering of setLastModified vs unpacking is wrong. Adding files to the directory while unpacking the war should change its modification time. Your setLastModified call will be invalidated by later changes. I'll check that and fix it. 2. I wonder why I do not see any check for directory time stamp in this commit. It only compares time stamps of xml and war files. ExpndWar should be correct. HostConfig needs fixing. 3. Generally, I am not sure how well setting modification time of a directory works cross-platform. There may be some edge cases here. I am more used to file modification times. Probably modern OSes are OK, but there may be some issues with drives accessed over network. (Just a guess. I do not have an actual example.) This can be solved by allowing to opt-out from this feature - see 4. below. Absent an actual problem I'd rather not add another configuration option. I should be able to test if setting the timestamp works and skip the test if it doesn't. The only catch is that the code that checks the timestamp and the code that sets the timestamp are widely separated at the moment. A little refactoring may be required. 4. If you are going to backport this, I intend to backport it to 8 and no further unless there is a demand for it from the users. I think we need to allow to opt out of last modified check on the expanded directory. Setting the date is OK - we are ignoring the boolean return value of that method, checking the date has to be configurable. Use case: The expanded directory is created via some other legacy method. E.g. by unpacking the war by some configuration tool. There may be some legacy scripts doing such unpacking. Maybe chef recipes, maybe RPMs. Personally I would just pack an expanded directory into the RPM, but I do not know what people will be doing. Someone can do unpacking from a script to save time on subsequent Tomcat startup, or if the same appbase is shared by several Tomcat instances. The script may be not smart enough to read timestamp of a file and set timestamp on the directory. (As a future help: touch -r reffile can be used to copy a timestamp from another file). One more example: the war and expanded directory are stored in svn or git. Those do not track time stamps of directories. Disabling unpackWARs should suffice (or is necessary for correct operation in some cases) for those use cases. The change needs to be clearly documented in the docs, migration guide and the release announcement. Hmm. A bigger issue is anything writing files into the docBase (e.g. some people write logs here despite it being a bad idea) is going to change the last modified time of the directory. As much as I like the simplicity of this approach, I think an alternative is required. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of RemoveUnpackWARs by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The RemoveUnpackWARs page has been changed by ChristopherSchultz: https://wiki.apache.org/tomcat/RemoveUnpackWARs?action=diffrev1=2rev2=3 Comment: Oops === Actually read-only filesystem === - If the filesystem is actually read-only (or effectively so, where the effective Tomcat user has no file-write rights whatsoever), then unpackWARs must be true in order to deploy. If all JSPs are pre-compiled and logs are not written to disk, Tomcat should be able to run on a read-only filesystem. + If the filesystem is actually read-only (or effectively so, where the effective Tomcat user has no file-write rights whatsoever), then unpackWARs must be false in order to deploy. If all JSPs are pre-compiled and logs are not written to disk, Tomcat should be able to run on a read-only filesystem. === Other use cases === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663772 - in /tomcat/trunk/java/org/apache/catalina/startup: Constants.java ExpandWar.java HostConfig.java
Author: markt
Date: Tue Mar 3 20:03:29 2015
New Revision: 1663772
URL: http://svn.apache.org/r1663772
Log:
Additional follow-up to r1663715
- Use a Tomcat specific file located in META-INF to track the WAR modification
time rather than using the expanded directory
- If the use expands the directory themselves, this tracking mechanism won;t be
used.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1663772r1=1663771r2=1663772view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Tue Mar 3
20:03:29 2015
@@ -31,6 +31,7 @@ public final class Constants {
public static final String DefaultWebXml = conf/web.xml;
public static final String HostContextXml = context.xml.default;
public static final String HostWebXml = web.xml.default;
+public static final String WarTracker = /META-INF/war-tracker;
/**
* A dummy value used to suppress loading the default web.xml file.
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1663772r1=1663771r2=1663772view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Tue Mar 3
20:03:29 2015
@@ -80,6 +80,7 @@ public class ExpandWar {
// Set up the variables used in the finally block of the following try
boolean success = false;
File docBase = new File(host.getAppBaseFile(), pathname);
+File warTracker = new File(host.getAppBaseFile(), pathname +
Constants.WarTracker);
try (JarFile jarFile = juc.getJarFile()) {
@@ -92,10 +93,9 @@ public class ExpandWar {
// time of the expanded directory to the last modified time of
// the WAR so changes to the WAR while Tomcat is stopped can be
// detected
-long dirLastModified = docBase.lastModified();
-
-if (dirLastModified == warLastModified) {
-// No changes to the WAR
+if (!warTracker.exists() || warTracker.lastModified() ==
warLastModified) {
+// No (detectable) changes to the WAR
+success = true;
return (docBase.getAbsolutePath());
}
@@ -157,9 +157,10 @@ public class ExpandWar {
}
}
-// Align the last modified time of the directory with the WAR
so
-// changes to the WAR while Tomcat is stopped can be detected
-docBase.setLastModified(warLastModified);
+// Create the warTracker file and align the last modified time
+// with the last modified time of the WAR
+warTracker.createNewFile();
+warTracker.setLastModified(warLastModified);
}
success = true;
} catch (IOException e) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663772r1=1663771r2=1663772view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar 3
20:03:29 2015
@@ -776,6 +776,9 @@ public class HostConfig
File xml = new File(host.getAppBaseFile(),
cn.getBaseName() + / + Constants.ApplicationContextXml);
+File warTracker = new File(host.getAppBaseFile(),
+cn.getBaseName() + / + Constants.WarTracker);
+
boolean xmlInWar = false;
JarEntry entry = null;
try (JarFile jar = new JarFile(war)) {
@@ -793,10 +796,10 @@ public class HostConfig
// should only be used if the directory is not out of date and
// unpackWARs is true. Note the code below may apply further limits
boolean useXml = false;
-File expandedDir = new File(host.getAppBaseFile(), cn.getBaseName());
// If the xml file exists then expandedDir must exists so no need to
// test that here
-if (xml.exists() unpackWARs expandedDir.lastModified() ==
war.lastModified()) {
+if (xml.exists() unpackWARs
+
RE: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
From: Mark Thomas [mailto:ma...@apache.org] Subject: Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties A bigger issue is anything writing files into the docBase (e.g. some people write logs here despite it being a bad idea) is going to change the last modified time of the directory. As much as I like the simplicity of this approach, I think an alternative is required. As Konstantin noted, the timestamp on a directory is rather ephemeral, especially on Windows or NAS boxes. Can you simply record the deployment occurrence by writing a file with some appropriately Tomcat-specific name into the chosen deployment directory and set the timestamp on that file to match the .war? - Chuck - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: [Tomcat Wiki] Update of RemoveUnpackWARs by ChristopherSchultz
From: Apache Wiki [mailto:wikidi...@apache.org] Subject: [Tomcat Wiki] Update of RemoveUnpackWARs by ChristopherSchultz + === Actually read-only filesystem === + If the filesystem is actually read-only (or effectively so, where the effective Tomcat user has no file-write rights whatsoever), then unpackWARs must be true in order to deploy. Is the above unpackWARs setting backwards from what you intended? Having it true on a read-only file system would seem to guarantee access errors. - Chuck - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57609] Tomcat 7.0.47 crashes with error code 610 038
https://bz.apache.org/bugzilla/show_bug.cgi?id=57609 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #3 from Mark Thomas ma...@apache.org --- And the tc-native version too while you are at it. -- 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-tc8.0.x-test-nio2 (in module tomcat-8.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-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2] -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 36 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150303/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv
[Bug 57570] Make processing of chunked encoding trailers an opt-in feature (align with HTTPD 2.4.12)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57570 --- Comment #2 from Mark Thomas ma...@apache.org --- RFC 7230 has added additional constraints [1] for the handling of trailers. [1] http://tools.ietf.org/html/rfc7230#page-37 -- 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: r1663778 - /tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Author: markt
Date: Tue Mar 3 20:18:34 2015
New Revision: 1663778
URL: http://svn.apache.org/r1663778
Log:
Fix back-port (IDE was configured for Java 8 rather than Java 7)
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1663778r1=1663777r2=1663778view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Tue Mar 3 20:18:34 2015
@@ -745,9 +745,9 @@ public class TestAbstractHttp11Processor
private static final long serialVersionUID = 1L;
@Override
-protected void doPut(HttpServletRequest req, HttpServletResponse resp)
+protected void doPut(HttpServletRequest req, final HttpServletResponse
resp)
throws ServletException, IOException {
-AsyncContext ac = req.startAsync();
+final AsyncContext ac = req.startAsync();
ac.start(new Runnable() {
@Override
public void run() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663787 - in /tomcat/site/trunk: docs/migration-8.html xdocs/migration-8.xml
Author: markt Date: Tue Mar 3 20:48:02 2015 New Revision: 1663787 URL: http://svn.apache.org/r1663787 Log: Add a deployment section to the Tomcat 8 migration guide Modified: tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/xdocs/migration-8.xml Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1663787r1=1663786r2=1663787view=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Tue Mar 3 20:48:02 2015 @@ -232,6 +232,9 @@ li a href=#Internal_APIsInternal APIs/a /li +li +a href=#DeploymentDeployment/a +/li /ol /li li @@ -536,6 +539,51 @@ of Apache Tomcat./p /ul + +/div +/div + + +div class=subsection +h4 id=DeploymentDeployment/h4 +div class=text + + +pDeployment of a web application as a WAR file and with Tomcat configured +not to unpack WARs will result in significantly slower startup times and +slower runtime performance. Start-up times have been measured between three +and ten times slower. Runtime impact will depend significantly on the +application structure./p + + +pIt is strongly recommended not to set codeunpackWARs=false/code on +a Host or codeunpackWAR=false/code on a Context. Below is a list of +common reasons for disabling unpacking and the recommended alternative for +Tomcat 8:/p + + +ul + +li +iSecurity (appBase is readOnly to Tomcat user)/i - Deploy (as a + different user) an unpacked directory to the appBase rather than a WAR + file./li + +li +iSharing an appBase between multiple hosts/i - Deploy WAR files + to a common location and then use context.xml files to add the web + applications to the hosts as required. Note sharing an appBase between + multiple hosts is strongly discouraged in all circumstances./li + +li +iOff-line deployment/i - As of Tomcat 8.0.21, Tomcat will detect + when a WAR has been updated while it is not running and, when next + started, remove the out of date expanded directory and deploy the updated + WAR file so simply use codeunpackWAR=true/code and continue to + deploy WARs when Tomcat is not running./li + +/ul + /div /div Modified: tomcat/site/trunk/xdocs/migration-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1663787r1=1663786r2=1663787view=diff == --- tomcat/site/trunk/xdocs/migration-8.xml (original) +++ tomcat/site/trunk/xdocs/migration-8.xml Tue Mar 3 20:48:02 2015 @@ -204,6 +204,36 @@ of Apache Tomcat./p /subsection + subsection name=Deployment + +pDeployment of a web application as a WAR file and with Tomcat configured +not to unpack WARs will result in significantly slower startup times and +slower runtime performance. Start-up times have been measured between three +and ten times slower. Runtime impact will depend significantly on the +application structure./p + +pIt is strongly recommended not to set codeunpackWARs=false/code on +a Host or codeunpackWAR=false/code on a Context. Below is a list of +common reasons for disabling unpacking and the recommended alternative for +Tomcat 8:/p + +ul + liiSecurity (appBase is readOnly to Tomcat user)/i - Deploy (as a + different user) an unpacked directory to the appBase rather than a WAR + file./li + liiSharing an appBase between multiple hosts/i - Deploy WAR files + to a common location and then use context.xml files to add the web + applications to the hosts as required. Note sharing an appBase between + multiple hosts is strongly discouraged in all circumstances./li + liiOff-line deployment/i - As of Tomcat 8.0.21, Tomcat will detect + when a WAR has been updated while it is not running and, when next + started, remove the out of date expanded directory and deploy the updated + WAR file so simply use codeunpackWAR=true/code and continue to + deploy WARs when Tomcat is not running./li +/ul + + /subsection + /section section name=Upgrading 8.0.x - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663784 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ webapps/docs/config/
Author: markt Date: Tue Mar 3 20:34:01 2015 New Revision: 1663784 URL: http://svn.apache.org/r1663784 Log: Indirectly fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. Note: Tomcat does this by adding a META-INF/war-tracking file to the expanded diretcory and setting the last modified time of this file to the last modified time of the WAR. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Constants.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/config/host.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 20:34:01 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #31 from Mark Thomas ma...@apache.org --- I've added a section to the migration guide for 7.0.x - 8.0.x covering deployment and the performance drop if unpackWARs=false is used. I've added the 'detect WAR has been modified while Tomcat isn't running' feature to trunk and 8.0.x (will be in 8.0.21 onwards). As previosuly stated, I believe we have done enough at this point to resolve this issue. -- 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: r1663781 - /tomcat/trunk/webapps/docs/config/host.xml
Author: markt Date: Tue Mar 3 20:28:57 2015 New Revision: 1663781 URL: http://svn.apache.org/r1663781 Log: Document new behaviour Modified: tomcat/trunk/webapps/docs/config/host.xml Modified: tomcat/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1663781r1=1663780r2=1663781view=diff == --- tomcat/trunk/webapps/docs/config/host.xml (original) +++ tomcat/trunk/webapps/docs/config/host.xml Tue Mar 3 20:28:57 2015 @@ -275,10 +275,15 @@ placed in the codeappBase/code directory as web application archive (WAR) files to be unpacked into a corresponding disk directory structure, codefalse/code to run such web applications directly -from a WAR file. WAR files located outside of the Host's -strongappBase/strong will not be expanded. See +from a WAR file. See a href=#Automatic_Application_DeploymentAutomatic Application Deployment/a for more information./p +pNote: If Tomcat expands the WAR file then it will add a file +(code/META-INF/war-tracking/code) to the unpacked directory +structure which it uses to detect changes in the WAR file while Tomcat +is not running. Any such change will trigger the deletion of the +expanded directory and the deployment of the updated WAR file when +Tomcat next starts./p /attribute attribute name=workDir required=false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57659] New: Change to mime mapping breaks the ability to include javascript files
https://bz.apache.org/bugzilla/show_bug.cgi?id=57659 Bug ID: 57659 Summary: Change to mime mapping breaks the ability to include javascript files Product: Tomcat 6 Version: 6.0.43 Hardware: PC Status: NEW Severity: regression Priority: P2 Component: Servlet JSP API Assignee: dev@tomcat.apache.org Reporter: d.avan...@gmail.com This issue is related to bug ID 54527. In this earlier defect, the mime mappings in Tomcat 6.0.37 web.xml were synchronized with the Tomcat 7 mapping. One such mapping that was synchronized was the js mapping. It was changed from text/javascript to application/javascript. However, there is another aspect of the synchronization that was omitted. In Tomcat 7, the serveResource method of DefaultServlet.java contains NEW logic that allows 'contentType.contains(/javascript)' to be included. This logic is not present in Tomcat 6.0.37.Because it is not present, the new mime-mapping for js files will cause an IllegalStateException when trying to include JS files from JSP pages: SEVERE: Servlet.service() for servlet default threw exception java.lang.IllegalStateException at org.apache.jasper.runtime.ServletResponseWrapperInclude.getOutputStream(ServletResponseWrapperInclude.java:63) at org.apache.catalina.servlets.DefaultServlet.serveResource(DefaultServlet.java:884) at org.apache.catalina.servlets.DefaultServlet.doGet(DefaultServlet.java:422) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:723) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) : at org.apache.jasper.runtime.JspRuntimeLibrary.include(JspRuntimeLibrary.java:968) -- 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: r1663785 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml
Author: markt Date: Tue Mar 3 20:36:16 2015 New Revision: 1663785 URL: http://svn.apache.org/r1663785 Log: Remove the ToC from the migration overview since the bulk of the content is just a set of links anyway Modified: tomcat/site/trunk/docs/migration.html tomcat/site/trunk/xdocs/migration.xml Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1663785r1=1663784r2=1663785view=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Tue Mar 3 20:36:16 2015 @@ -192,34 +192,6 @@ div id=mainRight div id=content h2 style=display: none;Content/h2 -h3 id=Table_of_ContentsTable of Contents/h3 -div class=text - -ul -li -a href=#Before_upgrading_or_migratingBefore upgrading or migrating/a -/li -li -a href=#Migrating_from_5.5.x_to_6.0.xMigrating from 5.5.x to 6.0.x/a -/li -li -a href=#Upgrading_between_6.0.x_versionsUpgrading between 6.0.x versions/a -/li -li -a href=#Migrating_from_6.0.x_to_7.0.xMigrating from 6.0.x to 7.0.x/a -/li -li -a href=#Upgrading_between_7.0.x_versionsUpgrading between 7.0.x versions/a -/li -li -a href=#Migrating_from_7.0.x_to_8.0.xMigrating from 7.0.x to 8.0.x/a -/li -li -a href=#Upgrading_between_8.0.x_versionsUpgrading between 8.0.x versions/a -/li -/ul - -/div h3 id=Before_upgrading_or_migratingBefore upgrading or migrating/h3 div class=text Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1663785r1=1663784r2=1663785view=diff == --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Tue Mar 3 20:36:16 2015 @@ -8,10 +8,6 @@ body -section name=Table of Contents -toc/ -/section - section name=Before upgrading or migrating pWhen updating from one major Apache Tomcat version a newer one, please make - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 58 mins 4 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150303/bin/opens sl -Dexecute.test.apr=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat
[Bug 57653] APR/native crash during HTTP upgrade
https://bz.apache.org/bugzilla/show_bug.cgi?id=57653 --- Comment #2 from Christopher Schultz ch...@christopherschultz.net --- Created attachment 32543 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32543action=edit Safety patch for tcnative 1.1.x branch Please patch tcnative with this and see if it catches the exact problem (likely invalid socket). Note that this is not a fix: it's only doing sanity-checking on the pollset and the sockets being manipulated. -- 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-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 59 mins 41 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150303/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150303/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (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-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : 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-nio/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/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 42 mins 35 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-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/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wor kspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150303.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-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.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/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
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : 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-apr/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/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 42 mins 8 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-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/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150303/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.te st.nio=false -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 -Dexecute.test.apr=true -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150303.jar -Dtest.temp=output/test-tmp-APR -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-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.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/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
WAR FileSystem for fast nested JAR access?
In https://bz.apache.org/bugzilla/show_bug.cgi?id=57251, Mark Thomas wrote: The fix for bug 57472 might shave a few seconds of the deployment time but it doesn't appear to make a significant difference. The fundamental problem when running from a packed WAR is that to access any resource in a JAR, Tomcat has to do the following: - open the WAR - get the entry for the JAR - get the InputStream for the JAR entry - Create a JarInputStream - Read the JarInputStream until it finds the entry it wants This is always going to be slow. The reason that it is fast in Tomcat 7 and earlier took some digging. In unpackWARs is false in Tomcat 7, it unpacks the JARs anyway into the work directory and uses them from there. Performance is therefore comparable with unpackWARs=true. Has anyone looked into using a NIO2 FileSystem for this? It may offer a way to avoid having to stream the entry in order to be able to locate a resource. ZipFile is fast, I believe, because it has random access to the archive and can seek directly to an entry's location based on the zip index; the jar: FileSystem seems to be able to do the same. However, neither can cope with nested entries: ZipFile because its constructor takes a File rather than a Path and uses native code, and ZipFS because it relies on URIs and can't cope with a jar: URI based on another jar: URI (ye olde problem with jar: URL syntax). What a FileSystem can do differently is return a FileChannel which supports seek operations over the archive's content. IOW, if ZipFS can work given a random access channel to bytes on disk, the same approach could be adopted with a random access channel to bytes on a virtual FileSystem. I imagine that would get pretty hairy for write operations but fortunately we would not need to deal with that. If no-one’s looked at it yet I'll take a shot. Cheers Jeremy FWIW, this could also be exposed to web applications e.g. FileSystem webappFS = servletContext.getFileSystem(); Path resource = webappFS.getPath(request.getPathInfo()); Files.copy(resource, response.getOutputStream()); signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
On 03/03/2015 15:48, Konstantin Kolinko wrote: 2015-03-03 17:47 GMT+03:00 ma...@apache.org: Author: markt Date: Tue Mar 3 14:47:12 2015 New Revision: 1663715 URL: http://svn.apache.org/r1663715 Log: In directly fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 You meant Indirectly. I did. 1. The above ordering of setLastModified vs unpacking is wrong. Adding files to the directory while unpacking the war should change its modification time. Your setLastModified call will be invalidated by later changes. I'll check that and fix it. 2. I wonder why I do not see any check for directory time stamp in this commit. It only compares time stamps of xml and war files. ExpndWar should be correct. HostConfig needs fixing. 3. Generally, I am not sure how well setting modification time of a directory works cross-platform. There may be some edge cases here. I am more used to file modification times. Probably modern OSes are OK, but there may be some issues with drives accessed over network. (Just a guess. I do not have an actual example.) This can be solved by allowing to opt-out from this feature - see 4. below. Absent an actual problem I'd rather not add another configuration option. I should be able to test if setting the timestamp works and skip the test if it doesn't. The only catch is that the code that checks the timestamp and the code that sets the timestamp are widely separated at the moment. A little refactoring may be required. 4. If you are going to backport this, I intend to backport it to 8 and no further unless there is a demand for it from the users. I think we need to allow to opt out of last modified check on the expanded directory. Setting the date is OK - we are ignoring the boolean return value of that method, checking the date has to be configurable. Use case: The expanded directory is created via some other legacy method. E.g. by unpacking the war by some configuration tool. There may be some legacy scripts doing such unpacking. Maybe chef recipes, maybe RPMs. Personally I would just pack an expanded directory into the RPM, but I do not know what people will be doing. Someone can do unpacking from a script to save time on subsequent Tomcat startup, or if the same appbase is shared by several Tomcat instances. The script may be not smart enough to read timestamp of a file and set timestamp on the directory. (As a future help: touch -r reffile can be used to copy a timestamp from another file). One more example: the war and expanded directory are stored in svn or git. Those do not track time stamps of directories. Disabling unpackWARs should suffice (or is necessary for correct operation in some cases) for those use cases. The change needs to be clearly documented in the docs, migration guide and the release announcement. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663713 - in /tomcat/site/trunk: docs/ xdocs/
Author: kkolinko Date: Tue Mar 3 14:30:52 2015 New Revision: 1663713 URL: http://svn.apache.org/r1663713 Log: Correct naming, add TM characters Modified: tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/xdocs/download-60.xml tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/download-80.xml tomcat/site/trunk/xdocs/download-connectors.xml tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1663713r1=1663712r2=1663713view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Tue Mar 3 14:30:52 2015 @@ -194,7 +194,7 @@ h3 id=Tomcat_6_DownloadsTomcat 6 Downloads/h3 div class=text -pWelcome to the Tomcat 6.x download page. This page provides download +pWelcome to the Apache Tomcattrade; 6.x download page. This page provides download links for obtaining the latest version of Tomcat 6.0.x, as well as links to the archives of older releases. /p Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1663713r1=1663712r2=1663713view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Tue Mar 3 14:30:52 2015 @@ -194,7 +194,7 @@ h3 id=Tomcat_7_DownloadsTomcat 7 Downloads/h3 div class=text -pWelcome to the Tomcat 7.x download page. This page provides download +pWelcome to the Apache Tomcattrade; 7.x download page. This page provides download links for obtaining the latest version of Tomcat 7.0.x, as well as links to the archives of older releases. /p Modified: tomcat/site/trunk/docs/download-80.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1663713r1=1663712r2=1663713view=diff == --- tomcat/site/trunk/docs/download-80.html (original) +++ tomcat/site/trunk/docs/download-80.html Tue Mar 3 14:30:52 2015 @@ -194,7 +194,7 @@ h3 id=Tomcat_8_DownloadsTomcat 8 Downloads/h3 div class=text -pWelcome to the Tomcat 8.x download page. This page provides download +pWelcome to the Apache Tomcattrade; 8.x download page. This page provides download links for obtaining the latest version of Tomcat 8.0.x, as well as links to the archives of older releases. /p Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1663713r1=1663712r2=1663713view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Tue Mar 3 14:30:52 2015 @@ -195,7 +195,7 @@ div class=text -pUse the links below to download Tomcat Connectors from one of +pUse the links below to download Apache Tomcattrade; Connectors from one of our mirrors. You strongmust/strong a href=#Verify_the_Integrity_of_the_Filesverify the integrity/a of the downloaded files using signatures downloaded from our main distribution directory./p Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1663713r1=1663712r2=1663713view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Tue Mar 3 14:30:52 2015 @@ -195,7 +195,7 @@ div class=text -pUse the links below to download Tomcat Native from one of +pUse the links below to download Apache Tomcattrade; Native from one of our mirrors. You strongmust/strong a href=#Verify_the_Integrity_of_the_Filesverify the integrity/a of the downloaded files using signatures downloaded from our main distribution directory./p Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1663713r1=1663712r2=1663713view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Tue Mar 3 14:30:52 2015 @@ -194,7 +194,7 @@ h3 id=Apache_Taglibs_DownloadsApache Taglibs Downloads/h3 div
[Tomcat Wiki] Update of RemoveUnpackWARs by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The RemoveUnpackWARs page has been changed by markt: https://wiki.apache.org/tomcat/RemoveUnpackWARs New page: = Removing the unpackWARs feature = This page is intended to collect the reasons for and against the removal of this feature. The main purpose is to review use cases for using unpackWARs to ensure that a suitable alternative would be available if the feature was removed but all arguments for and against the feature are welcome. == Background == Prior to Tomcat 8 unpackWARs=false did not result in the web application running entirely from the WAR. For performance reasons, any JARs in WEB-INF/lib were unpacked to the work directory and accessed from there. Tomcat 8 introduced a new resources implementation that did not perform this unpacking. This had a significant (e.g. 3x to 10x slower application start) performance impact - [[https://bz.apache.org/bugzilla/show_bug.cgi?id=57251|Bug 57251]]. One of the options suggested in the discussion on that bug was the removal of the unpackWARs feature. == Use Cases for unpackWARs=false == === Simpler deployment while Tomcat is stopped === If unpackWARs=true and a WAR is updated while Tomcat is stopped, Tomcat will not realise that the unpacked directory structure is from an older version of the WAR and will continue to use it. The current work-arounds are: * ensure that the exploded directory is deleted when the WAR is replaced * deploy an exploded directory rather than a WAR * use unpackWARs=false The last of these work-arounds is often viewed as the simplest and would not be available if the unpackWARs option was removed. Work is in progress to handle this use case within the existing automatic deployment code so WARs updated while Tomcat is shut-down result in the old directory being removed and the new WAR expanded in its place. === Security - make appBase read-only === Note that this discussions assumes a pre-existing application or Tomcat vulnerability that permits writing files into Tomcat's appBase. If the appBase is writeable by the Tomcat user and automatic deployment is enabled then it makes it easier for an attacker to deploy a malicious application by placing it in the appBase. Using unpackWARs=false and a read-only appBase defeats this particular attack vector in Tomcat 8. In Tomcat 7 the protection is provides is less than complete since the location where the JARs are copied to remains writable. The removal of unpackWARs would effectively require the deployment of web applications as exploded directories if the appBase was to remain read-only to the Tomcat user. === Other use cases === Additional use cases welcome. Either directly on this page or via the users mailing list. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663712 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: kkolinko Date: Tue Mar 3 14:24:26 2015 New Revision: 1663712 URL: http://svn.apache.org/r1663712 Log: Add TM character Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1663712r1=1663711r2=1663712view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Mar 3 14:24:26 2015 @@ -197,7 +197,7 @@ div class=text -pApache Tomcat is an open source software implementation of the Java Servlet +pApache Tomcattrade; is an open source software implementation of the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed under the a href=http://jcp.org/en/introduction/overview; rel=nofollowJava Community Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1663712r1=1663711r2=1663712view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Mar 3 14:24:26 2015 @@ -13,7 +13,7 @@ section name=Apache Tomcat -pApache Tomcat is an open source software implementation of the Java Servlet +pApache Tomcat#8482; is an open source software implementation of the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed under the a href=http://jcp.org/en/introduction/overview; rel=nofollowJava Community - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #30 from Mark Thomas ma...@apache.org --- (In reply to Konstantin Kolinko from comment #29) (In reply to Mark Thomas from comment #26) Medium to long term I'm thinking about removing the unpackWARs feature and always unpacking into the appBase. I am -1 on removing this feature, as Fair enough. I'm not that set on removing it at the moment. Given the performance issues, my main concern is that for each use case for using unpackWARs=false there is an alternative confiuration approach that doesn't add too much burden to the end users. -- 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: r1663566 - in /tomcat/trunk/java/org/apache/coyote: ajp/AjpProcessor.java http11/Http11Processor.java
Author: markt
Date: Tue Mar 3 09:19:59 2015
New Revision: 1663566
URL: http://svn.apache.org/r1663566
Log:
Avoid accidental fall-through in a later change.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.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=1663566r1=1663565r2=1663566view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Mar 3
09:19:59 2015
@@ -602,6 +602,7 @@ public class AjpProcessor extends Abstra
}
case END_REQUEST: {
// NO-OP for AJP
+break;
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1663566r1=1663565r2=1663566view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Mar 3
09:19:59 2015
@@ -976,6 +976,7 @@ public class Http11Processor extends Abs
}
case END_REQUEST: {
endRequest();
+break;
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-255) Getting Target Unreachable, identifier 'pessoaBean' resolved to null on tomcat:run but not in tomcat:run-war
[ https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-255: --- Fix Version/s: (was: 2.4) 2.3 Getting Target Unreachable, identifier 'pessoaBean' resolved to null on tomcat:run but not in tomcat:run-war -- Key: MTOMCAT-255 URL: https://issues.apache.org/jira/browse/MTOMCAT-255 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.2 Environment: gilberto.andrade@A37710:~$ mvn -version Apache Maven 3.0.4 (r1232337; 2012-01-17 05:44:56-0300) Maven home: /home/gilberto.andrade/bin/maven Java version: 1.7.0_45, vendor: Oracle Corporation Java home: /usr/java/jdk1.7.0_45/jre Default locale: pt_BR, platform encoding: UTF-8 OS name: linux, version: 3.7.10-1.24-desktop, arch: amd64, family: unix Reporter: Gilberto C Andrade Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Fix For: 2.3 Attachments: MTOMCAT-255.patch, MTOMCAT-255.zip Simple JSF 2.2 project with just one manage bean(PessoaMb) and one xhtml page. 1 Run mvn clean tomcat7:run 2 hitting http://localhost:8080/MTOMCAT-255/pessoaView.xhtml 3 enter some value on field or click the consultar button The same steps works when using tomcat7:run-war. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663670 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Tue Mar 3 11:34:17 2015
New Revision: 1663670
URL: http://svn.apache.org/r1663670
Log:
Formatting - no functional change
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1663670r1=1663669r2=1663670view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Mar 3
11:34:17 2015
@@ -629,8 +629,7 @@ public class ContextConfig implements Li
if (!docDir.exists()) {
File warFile = new File(docBase + .war);
if (warFile.exists()) {
-URL war =
-new URL(jar: + warFile.toURI().toURL() + !/);
+URL war = new URL(jar: + warFile.toURI().toURL() + !/);
if (unpackWARs) {
docBase = ExpandWar.expand(host, war, pathName);
file = new File(docBase);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663669 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Tue Mar 3 11:33:08 2015
New Revision: 1663669
URL: http://svn.apache.org/r1663669
Log:
Remove duplication.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1663669r1=1663668r2=1663669view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Mar 3
11:33:08 2015
@@ -613,8 +613,8 @@ public class ContextConfig implements Li
}
if (docBase.toLowerCase(Locale.ENGLISH).endsWith(.war)
!file.isDirectory()) {
+URL war = new URL(jar: + (new File(docBase)).toURI().toURL() +
!/);
if (unpackWARs) {
-URL war = new URL(jar: + (new File(docBase)).toURI().toURL()
+ !/);
docBase = ExpandWar.expand(host, war, pathName);
file = new File(docBase);
docBase = file.getCanonicalPath();
@@ -622,8 +622,6 @@ public class ContextConfig implements Li
((StandardContext)
context).setOriginalDocBase(origDocBase);
}
} else {
-URL war =
-new URL(jar: + (new File (docBase)).toURI().toURL()
+ !/);
ExpandWar.validate(host, war, pathName);
}
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663672 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Tue Mar 3 11:38:27 2015
New Revision: 1663672
URL: http://svn.apache.org/r1663672
Log:
Clean-up. No functional change.
- Fix a Java 8 Javadoc warning.
- Improve the Javadoc.
- Format the code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1663672r1=1663671r2=1663672view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Mar 3
11:38:27 2015
@@ -243,29 +243,31 @@ public class ContextConfig implements Li
private WebXmlParser webXmlParser;
+
// - Properties
+
/**
- * Return the location of the default deployment descriptor
+ * Obtain the location of the default deployment descriptor.
+ *
+ * @return The path to the default web.xml. If not absolute, it is relative
+ * to CATALINA_BASE.
*/
public String getDefaultWebXml() {
-if( defaultWebXml == null ) {
-defaultWebXml=Constants.DefaultWebXml;
+if (defaultWebXml == null) {
+defaultWebXml = Constants.DefaultWebXml;
}
-
-return (this.defaultWebXml);
-
+return defaultWebXml;
}
/**
- * Set the location of the default deployment descriptor
+ * Set the location of the default deployment descriptor.
*
- * @param path Absolute/relative path to the default web.xml
+ * @param path The path to the default web.xml. If not absolute, it is
+ * relative to CATALINA_BASE.
*/
public void setDefaultWebXml(String path) {
-
this.defaultWebXml = path;
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663679 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt Date: Tue Mar 3 11:56:30 2015 New Revision: 1663679 URL: http://svn.apache.org/r1663679 Log: Only use the context.xml from an unpacked directory for a WAR if unpackWARs is true Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 11:56:30 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 54 mins 49 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150303/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150303/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (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-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 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-nio : 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-nio/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/logs-NIO -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO] -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-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/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wor kspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150303.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-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.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/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
[Tomcat Wiki] Update of Development by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Development page has been changed by markt: https://wiki.apache.org/tomcat/Development?action=diffrev1=6rev2=7 * '''[[Cookies]]''' - Reviewing Tomcat's cookie support * '''[[BuildTcNativeWin]]''' - Building the tc native binaries for Windows * '''[[JDTCoreBatchCompiler]]''' - Managing Tomcat's dependency on the Eclipse JDT Core Batch Compiler + * '''[[RemoveUnpackWARs]]''' - Removing the unpackWARs configuration option - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #27 from Francisco A. Lozano floz...@gmail.com --- Does that address Comment 24 (https://bz.apache.org/bugzilla/show_bug.cgi?id=57251#c24)? -- 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: r1663676 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Tue Mar 3 11:52:45 2015
New Revision: 1663676
URL: http://svn.apache.org/r1663676
Log:
Only use the context.xml from an unpacked directory for a WAR if unpackWARs is
true
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1663676r1=1663675r2=1663676view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar 3
11:52:45 2015
@@ -791,7 +791,7 @@ public class HostConfig
Context context = null;
try {
-if (deployXML xml.exists() !copyXML) {
+if (deployXML xml.exists() unpackWARs !copyXML) {
synchronized (digesterLock) {
try {
context = (Context) digester.parse(xml);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1663681 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt Date: Tue Mar 3 11:57:29 2015 New Revision: 1663681 URL: http://svn.apache.org/r1663681 Log: Only use the context.xml from an unpacked directory for a WAR if unpackWARs is true Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 11:57:29 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1662986,1663265,1663278,1663325,1663535,1663567 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #26 from Mark Thomas ma...@apache.org --- Short term, I'm working on adding a feature that detects if a WAR is updated while Tomcat is shut down. Currently, I view that as sufficient to resolve this bug. Medium to long term I'm thinking about removing the unpackWARs feature and always unpacking into the appBase. Any move in that direction will be preceeded by a discussion on one of the mailing lists - probably the users list since that is where we'd get best feedback on the impact of such a change. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 58 mins 29 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150303.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150303-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150303/bin/openssl -Dexecute.test.apr=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk
svn commit: r1663572 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ test/org/apache/catalina/startup/
Author: markt Date: Tue Mar 3 09:30:10 2015 New Revision: 1663572 URL: http://svn.apache.org/r1663572 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57621 When an async request completes, need to ensure that any unread input is swallowed. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 09:30:10 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1662986,1663265,1663278,1663325,1663535 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
[Bug 57528] Random NPE when sending multipart content
https://bz.apache.org/bugzilla/show_bug.cgi?id=57528 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #4 from Mark Thomas ma...@apache.org --- It has been a month and no debug logging has been provided. Closing as invalid on the assumption that the OP enabled debug logging and identified the root cause as something other than a Tomcat bug. If this is not correct and you still see this error then please re-open this issue and attach the requested debug log information that will provide details as to why a null is returned in this case. -- 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: r1663715 - in /tomcat/trunk/java/org/apache/catalina/startup: ExpandWar.java HostConfig.java LocalStrings.properties
Author: markt
Date: Tue Mar 3 14:47:12 2015
New Revision: 1663715
URL: http://svn.apache.org/r1663715
Log:
In directly fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57251
Enable Tomcat to detect when a WAR file has been changed while Tomcat is not
running. Note Tomcat does this by setting the last modified time of the
expanded directory to the last modified time of the WAR.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1663715r1=1663714r2=1663715view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Tue Mar 3
14:47:12 2015
@@ -55,8 +55,7 @@ public class ExpandWar {
/**
* Expand the WAR file found at the specified URL into an unpacked
- * directory structure, and return the absolute pathname to the expanded
- * directory.
+ * directory structure.
*
* @param host Host war is being installed for
* @param war URL of the web application archive to be expanded
@@ -67,31 +66,62 @@ public class ExpandWar {
*WAR file is invalid
* @exception IOException if an input/output error was encountered
* during expansion
+ *
+ * @return The absolute path to the expanded directory foe the given WAR
*/
public static String expand(Host host, URL war, String pathname)
throws IOException {
-// Make sure that there is no such directory already existing
-File docBase = new File(host.getAppBaseFile(), pathname);
-if (docBase.exists()) {
-// War file is already installed
-return (docBase.getAbsolutePath());
-}
-
-// Create the new document base directory
-if(!docBase.mkdir() !docBase.isDirectory())
-throw new IOException(sm.getString(expandWar.createFailed,
docBase));
-
-// Expand the WAR into the new document base directory
-String canonicalDocBasePrefix = docBase.getCanonicalPath();
-if (!canonicalDocBasePrefix.endsWith(File.separator)) {
-canonicalDocBasePrefix += File.separator;
-}
+// Open the connection to the WAR. There is no explicit close method.
+// You have to get the JarFile and close that.
JarURLConnection juc = (JarURLConnection) war.openConnection();
juc.setUseCaches(false);
+// Set up the variables used in the finally block of the following try
boolean success = false;
+File docBase = new File(host.getAppBaseFile(), pathname);
+
try (JarFile jarFile = juc.getJarFile()) {
+
+// Get the last modified time for the WAR
+long warLastModified = juc.getContentLengthLong();
+
+// Check to see of the WAR has been expanded previously
+if (docBase.exists()) {
+// A WAR was expanded. Tomcat will have set the last modified
+// time of the expanded directory to the last modified time of
+// the WAR so changes to the WAR while Tomcat is stopped can be
+// detected
+long dirLastModified = docBase.lastModified();
+
+if (dirLastModified == warLastModified) {
+// No changes to the WAR
+return (docBase.getAbsolutePath());
+}
+
+log.info(sm.getString(expandWar.deleteOld, docBase));
+
+// WAR must have been modified. Remove expanded directory.
+if (!delete(docBase)) {
+throw new
IOException(sm.getString(expandWar.deleteFailed, docBase));
+}
+}
+
+// Create the new document base directory
+if(!docBase.mkdir() !docBase.isDirectory()) {
+throw new IOException(sm.getString(expandWar.createFailed,
docBase));
+}
+
+// Align the last modified time of the directory with the WAR so
+// changes to the WAR while Tomcat is stopped can be detected
+docBase.setLastModified(warLastModified);
+
+// Expand the WAR into the new document base directory
+String canonicalDocBasePrefix = docBase.getCanonicalPath();
+if (!canonicalDocBasePrefix.endsWith(File.separator)) {
+canonicalDocBasePrefix += File.separator;
+}
+
EnumerationJarEntry jarEntries = jarFile.entries();
while (jarEntries.hasMoreElements()) {
JarEntry jarEntry = jarEntries.nextElement();
@@
