[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 34 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 -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-8.6-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171130.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.8-SNAPSHOT.jar:/srv/g ump/public/workspace/apache-commons/logging/target/commons-logging-20171130.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171130.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-8.6-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 8.6-SNAPSHOT on 3176 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:66: Line matches the illegal pattern '\s+$'. [RegexpSingleline] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:549: Got 1 errors and 0 warnings. Total time: 34 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20171130060006, vmgump-vm3.apache.org:vmgump:20171130060006 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump-vm3] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1816678 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Nov 30 07:28:23 2017 New Revision: 1816678 URL: http://svn.apache.org/viewvc?rev=1816678&view=rev Log: ws police Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816678&r1=1816677&r2=1816678&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 30 07:28:23 2017 @@ -63,7 +63,7 @@ Add missing SHA-512 hash for release artifacts to the build script. -(markt) +(markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1816673 - /tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html
On 30/11/2017 02:09, hux...@apache.org wrote: > Author: huxing > Date: Thu Nov 30 02:08:59 2017 > New Revision: 1816673 > > URL: http://svn.apache.org/viewvc?rev=1816673&view=rev > Log: > Servlet 4.0 is officially released > > Modified: > tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html > > Modified: tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html > URL: > http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html?rev=1816673&r1=1816672&r2=1816673&view=diff > == > --- tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html (original) > +++ tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html Thu Nov 30 > 02:08:59 2017 > @@ -167,7 +167,7 @@ for clarity. > > > > - Servlet 4.0 Early Preview examples > + Servlet 4.0 Server Push examples Since this is Tomcat 8 and Servlet 4.0 is not supported that link is correct - it does link to the Servlet 4.0 early preview examples (they depend on a Tomcat specific package rather than the spec API for Servlet 4.0 features). Give that the early preview has been deprecated I'm going to remove the early preview examples entirely from Tomcat 8.5.x. We want to encourage folks to use Tomcat 9 for Servlet 4.0 where they'll get the full API in the right package (rather than a partial implementation in a Tomncat specific package). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.24
Hi, The proposed 8.5.24 release is: [ ] Broken - do not release [ X ] Stable - go ahead and release as 8.5.24 Unit test passed. Examples ok, except for the following one issue: in example/servlets/index.html "Servlet 4.0 Early Preview examples" is no longer early preview. (Fixed in r1816673) Our test web application works fine. -- Mark Thomas 2017 Nov 27 (Mon) 21:46 Tomcat Developers List [VOTE] Release Apache Tomcat 8.5.24 The proposed Apache Tomcat 8.5.24 release is now available for voting. The major changes compared to the 8.5.23 release are: - Java 9 is fully supported - Fixed a number of HTTP/2 issues - Fixed numerous JASPIC issues with patches from Lazar - Update the packaged version of the Tomcat Native Library to 1.2.16 to pick up the latest Windows binaries built with APR 1.6.3 and OpenSSL 1.0.2m Along with lots of other bug fixes and improvements. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1161/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/ The proposed 8.5.24 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.24 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1816673 - /tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html
Author: huxing Date: Thu Nov 30 02:08:59 2017 New Revision: 1816673 URL: http://svn.apache.org/viewvc?rev=1816673&view=rev Log: Servlet 4.0 is officially released Modified: tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html Modified: tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html?rev=1816673&r1=1816672&r2=1816673&view=diff == --- tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html (original) +++ tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html Thu Nov 30 02:08:59 2017 @@ -167,7 +167,7 @@ for clarity. - Servlet 4.0 Early Preview examples + Servlet 4.0 Server Push examples HTTP/2 server push - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 36 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-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 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 -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-8.6-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171130.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.8-SNAPSHOT.jar:/srv/g ump/public/workspace/apache-commons/logging/target/commons-logging-20171130.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171130.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-8.6-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 8.6-SNAPSHOT on 3176 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:66: Line matches the illegal pattern '\s+$'. [RegexpSingleline] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:549: Got 1 errors and 0 warnings. Total time: 35 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2017113010, vmgump-vm3.apache.org:vmgump:2017113010 Gump E-mail Identifier (unique within run) #4. -- Apache Gump http://gump.apache.org/ [Instance: vmgump-vm3] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r23327 - in /dev/tomcat/tomcat-8/v8.5.24/bin/embed: apache-tomcat-8.5.24-embed.tar.gz.sha512 apache-tomcat-8.5.24-embed.zip.sha512
> Log: > AAdd missing sha512 hashes AAdd -> Add ? -- markt 2017 Nov 30 (Thu) 03:57 dev svn commit: r23327 - in /dev/tomcat/tomcat-8/v8.5.24/bin/embed: apache-tomcat-8.5.24-embed.tar.gz.sha512 apache-tomcat-8.5.24-embed.zip.sha512 Author: markt Date: Wed Nov 29 19:57:15 2017 New Revision: 23327 Log: AAdd missing sha512 hashes Added: dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 Added: dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 == --- dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 (added) +++ dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 Wed Nov 29 19:57:15 2017 @@ -0,0 +1 @@ +4c8478908ca844ea1f5b3c4e22d6def183d9e60da626c7070a43379967d9df43dcd8545426a3792a349a8e11ba38e9d4ea9e24cad11f1c130061bd5e2b33cd0e *apache-tomcat-8.5.24-embed.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 == --- dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 (added) +++ dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 Wed Nov 29 19:57:15 2017 @@ -0,0 +1 @@ +90a3e5297b02ea11ccb4c7cce1bc909f9f8d67b3afc1b3876e3073570c4a7e272a6fb5d686631dd5ebc7bd438943e506761f37b2a6867b871ac7feeeb792fc39 *apache-tomcat-8.5.24-embed.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project taglibs-standard-spec (in module tomcat-taglibs) 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 taglibs-standard-spec has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 140 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - taglibs-standard-spec : JSP Taglibs Full details are available at: http://vmgump-vm3.apache.org/tomcat-taglibs/taglibs-standard-spec/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole jar output [taglibs-standard-spec-*[0-9T].jar] identifier set to project name -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/standard/spec/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/standard/spec/pom.xml -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump-vm3.apache.org/tomcat-taglibs/taglibs-standard-spec/gump_work/build_tomcat-taglibs_taglibs-standard-spec.html Work Name: build_tomcat-taglibs_taglibs-standard-spec (Type: Build) Work ended in a state of : Failed Elapsed: 3 secs Command Line: /opt/maven3/bin/mvn --batch-mode --settings /srv/gump/public/workspace/tomcat-taglibs/standard/spec/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard/spec] M2_HOME: /opt/maven3 - [INFO] Scanning for projects... [INFO] Downloading: http://localhost:8192/maven2/org/apache/taglibs/taglibs-parent/3/taglibs-parent-3.pom [INFO] Downloaded: http://localhost:8192/maven2/org/apache/taglibs/taglibs-parent/3/taglibs-parent-3.pom (8 KB at 57.6 KB/sec) [WARNING] [WARNING] Some problems were encountered while building the effective model for org.apache.taglibs:taglibs-standard-spec:bundle:1.2.6-SNAPSHOT [WARNING] 'parent.relativePath' of POM org.apache.taglibs:taglibs-standard:1.2.6-SNAPSHOT (/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml) points at org.apache.tomcat.taglibs:taglibs-aggregator instead of org.apache.taglibs:taglibs-parent, please verify your project structure @ org.apache.taglibs:taglibs-standard:1.2.6-SNAPSHOT, /srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml, line 23, column 11 [WARNING] [WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. [WARNING] [WARNING] For this reason, future Maven versions might no longer support building such malformed projects. [WARNING] [INFO] [INFO] [INFO] Building Apache Standard Taglib Specification API 1.2.6-SNAPSHOT [INFO] [INFO] Downloading: http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.pom [INFO] Downloaded: http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.pom (6 KB at 150.0 KB/sec) [INFO] Downloading: http://localhost:8192/maven2/org/apache/maven/surefire/surefire/2.15/surefire-2.15.pom [INFO] Downloaded: http://localhost:8192/maven2/org/apache/maven/surefire/surefire/2.15/surefire-2.15.pom (19 KB at 465.0 KB/sec) [INFO] Downloading: http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.jar [INFO] Downloaded: http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.jar (32 KB at 829.6 KB/sec) [INFO] Downloading: http://localhost:8192/maven2/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.pom [INFO] Downloaded: http://localhost:8192/maven2/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.pom (157 B at 3.9 KB/sec) [INFO] Downloading: http://localhost:8192/maven2/javax/el/el-api/1.0/el-api-1.0.pom [INFO] Downloaded: http://localhost:8192/maven2/javax/el/el-api/1.0/el-api-1.0.pom (184 B at 4.6 KB/sec) [INFO] Downloading: http://localhost:8192/maven2/org/easymock/easymock/3.0/easymock-3.0.pom [INFO] Downloaded: http://localhost:8192/maven2/org/easymock/easymock/3.0/easymock-3.0.pom (6 KB at 488.9 KB/sec) [INFO] Downloading: http://localhost:8192/maven2/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar [INFO] Downloading: http://localhost:8192/maven2/javax/el/el-api/1.0/el-api-1.0.jar [INFO] Downloading: http://localhost:8192/maven2/org/easymock/easymock/3.0/easymock-3.0.jar [INFO] Downloaded: http://localhost:8192/maven2/org/easymock/easymock/3.
svn commit: r1816655 - in /tomcat/trunk/test/org/apache/catalina/authenticator/jaspic: TestAuthConfigFactoryImpl.java TestPersistentProviderRegistrations.java
Author: markt
Date: Wed Nov 29 22:06:40 2017
New Revision: 1816655
URL: http://svn.apache.org/viewvc?rev=1816655&view=rev
Log:
Fix some SpotBugs issues in the tests
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java?rev=1816655&r1=1816654&r2=1816655&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
Wed Nov 29 22:06:40 2017
@@ -321,7 +321,9 @@ public class TestAuthConfigFactoryImpl {
System.setProperty(Globals.CATALINA_BASE_PROP, "test");
if (TEST_CONFIG_FILE.exists()) {
-TEST_CONFIG_FILE.delete();
+if (!TEST_CONFIG_FILE.delete()) {
+Assert.fail("Failed to delete " + TEST_CONFIG_FILE);
+}
}
}
@@ -335,7 +337,9 @@ public class TestAuthConfigFactoryImpl {
}
if (TEST_CONFIG_FILE.exists()) {
-TEST_CONFIG_FILE.delete();
+if (!TEST_CONFIG_FILE.delete()) {
+Assert.fail("Failed to delete " + TEST_CONFIG_FILE);
+}
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java?rev=1816655&r1=1816654&r2=1816655&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
Wed Nov 29 22:06:40 2017
@@ -126,7 +126,9 @@ public class TestPersistentProviderRegis
validateNoLayerAndAC(loadedProviders);
} finally {
if (f.exists()) {
-f.delete();
+if (!f.delete()) {
+Assert.fail("Failed to delete " + f);
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1816647 - svn:log
Author: kkolinko Revision: 1816647 Modified property: svn:log Modified: svn:log at Wed Nov 29 21:21:46 2017 -- --- svn:log (original) +++ svn:log Wed Nov 29 21:21:46 2017 @@ -1,7 +1 @@ -Update the Java EE 8 XML schema to the released versions. -- Picks up a couple of element name changes for web .xml -- Lots of whitespace changes (as with the previous versions I converted tabs to spaces and removed trailing spaces before committing) -- Adds (yes adds!) a handful of typos -- Some additional commentary - -No change to licensing. We are electing to distribute under the CDDL. +Add missing SHA-512 hash for release artifacts to the build script. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r23327 - in /dev/tomcat/tomcat-8/v8.5.24/bin/embed: apache-tomcat-8.5.24-embed.tar.gz.sha512 apache-tomcat-8.5.24-embed.zip.sha512
Author: markt Date: Wed Nov 29 19:57:15 2017 New Revision: 23327 Log: AAdd missing sha512 hashes Added: dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 Added: dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 == --- dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 (added) +++ dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.tar.gz.sha512 Wed Nov 29 19:57:15 2017 @@ -0,0 +1 @@ +4c8478908ca844ea1f5b3c4e22d6def183d9e60da626c7070a43379967d9df43dcd8545426a3792a349a8e11ba38e9d4ea9e24cad11f1c130061bd5e2b33cd0e *apache-tomcat-8.5.24-embed.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 == --- dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 (added) +++ dev/tomcat/tomcat-8/v8.5.24/bin/embed/apache-tomcat-8.5.24-embed.zip.sha512 Wed Nov 29 19:57:15 2017 @@ -0,0 +1 @@ +90a3e5297b02ea11ccb4c7cce1bc909f9f8d67b3afc1b3876e3073570c4a7e272a6fb5d686631dd5ebc7bd438943e506761f37b2a6867b871ac7feeeb792fc39 *apache-tomcat-8.5.24-embed.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r23326 - in /dev/tomcat/tomcat-9/v9.0.2/bin/embed: apache-tomcat-9.0.2-embed.tar.gz.sha512 apache-tomcat-9.0.2-embed.zip.sha512
Author: markt Date: Wed Nov 29 19:56:13 2017 New Revision: 23326 Log: AAdd missing sha512 hashes Added: dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.tar.gz.sha512 == --- dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.tar.gz.sha512 (added) +++ dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.tar.gz.sha512 Wed Nov 29 19:56:13 2017 @@ -0,0 +1 @@ +8ce885fa84e147608d68190253d56bb0cef19b5013527ac6a76e5e3a46cf6a629b46d87bce4aeeb1159ba75d4230955b50845988540e59389f798914b3bd8bc9 *apache-tomcat-9.0.2-embed.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.zip.sha512 == --- dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.zip.sha512 (added) +++ dev/tomcat/tomcat-9/v9.0.2/bin/embed/apache-tomcat-9.0.2-embed.zip.sha512 Wed Nov 29 19:56:13 2017 @@ -0,0 +1 @@ +5b06dc5ec931f45df16293c33d3e4f28f5f6fdabf9ca5e33a90deceb2a240af6f908cac5ed2b19449bb3101ed458fc91923cd5737eaf43c4bb054a0513e15a75 *apache-tomcat-9.0.2-embed.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1816647 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml
Author: markt Date: Wed Nov 29 19:50:57 2017 New Revision: 1816647 URL: http://svn.apache.org/viewvc?rev=1816647&view=rev Log: Update the Java EE 8 XML schema to the released versions. - Picks up a couple of element name changes for web .xml - Lots of whitespace changes (as with the previous versions I converted tabs to spaces and removed trailing spaces before committing) - Adds (yes adds!) a handful of typos - Some additional commentary No change to licensing. We are electing to distribute under the CDDL. Modified: tomcat/trunk/build.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1816647&r1=1816646&r2=1816647&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Nov 29 19:50:57 2017 @@ -1297,6 +1297,7 @@ + @@ -1314,6 +1315,7 @@ + @@ -2127,6 +2129,7 @@ skip.installer property in build.propert + @@ -2167,6 +2170,7 @@ skip.installer property in build.propert + Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816647&r1=1816646&r2=1816647&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 29 19:50:57 2017 @@ -61,6 +61,10 @@ Add an additional system property for the system property replacement. (remm) + +Add missing SHA-512 hash for release artifacts to the build script. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.24
On 29/11/17 17:36, Mark Thomas wrote: > On 28/11/2017 10:12, Violeta Georgieva wrote: >> Hi Mark, >> I'm still testing but I noticed that we miss some files with sha512 checksum >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/bin/embed/ >> >> The same is for Tomcat 9 artifacts. > > Hmm. I suspect user error on my part. Let me take a look. The sha512 patch missed a couple of required changes. The end result is the embedded tar.gz artifact contains the .sha512 for the .zip artifact and a few .sha512's are missing. The missing hashes I'll fix shortly along with the build.xml file. The extra file in the embedded archive isn't ideal but I'm not concerned enough to cancel the vote. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61831] NIO2 connector becomes intermittently unresponsive after some period of time
https://bz.apache.org/bugzilla/show_bug.cgi?id=61831 Remy Maucherat changed: What|Removed |Added Status|REOPENED|NEEDINFO -- 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 61831] NIO2 connector becomes intermittently unresponsive after some period of time
https://bz.apache.org/bugzilla/show_bug.cgi?id=61831 Oleg changed: What|Removed |Added Resolution|WORKSFORME |--- Status|RESOLVED|REOPENED --- Comment #2 from Oleg --- Hi, I realize that thread dump might look fine and this is the most confusing part: even simple curl command from the same host receives no response from this connector and it starts working fine after tomcat restart. At the same time tomcat in overall looks to be healthy and another connector works fine, as this happens from time to time on different servers, this doesn't look like to be OS or hardware issue but something which is tomcat NIO2 specific. And when we do any request to this NIO2 endpoint connector in a bad state - no thread is triggered in tomcat, while looking into tomcat source code it looks like that countdownlatch was not simply updated and service just hangs because of this but the root cause is still not clear. So curious what additional information we can provide to help investigate this issue together with tomcat apache dev team? Also, I'm not sure about your remark about custom executor - we don't use custom one, we just configure the one form tomcat. Regards, Oleg. -- 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: r1816617 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/des
On Wed, Nov 29, 2017 at 4:14 PM, Konstantin Kolinko wrote: > 22. I am -1 to all those STRICT_SERVLET_COMPLIANCE conditionals. > Ok, I'm replying in the context of the dispatcher http mapping override. In that case, it's really a case where it is used elsewhere: the community disagrees with the behavior but it is explicit in the specification. The default-context-path element needs a lot more work, so I won't do anything at the moment. Good point on the fragment xsd. Rémy > > My reading of section "30. default-context-path Element" on page 202 > of 246 of servlet-4_0_FINAL.pdf (in chapter 14.4 Deployment Descriptor > Diagram) > is that this feature is only usable at deployment time. > > I think this is only a hit to an application deployer (the person > performing a deployment). > > Is there some other place in the Spec PDF where this feature is documented? > The changelog chapter does not mention other places, and I do not see > any others with a quick search. > > > As a similar example: "short-name" in a tld file of a Tag Library is a > hint for the prefix used for those tags. It is not the actual prefix. > > > Thus I think that we do not need to change our > auto-deployment/deploy-on-startup procedure. > > > I think that this feature belongs to the ways how a web application > may be deployed programmatically. E.g.: > > 1) Make "path" parameter optional in "text/deploy" command of Manager > web application, > > http://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html# > Deploy_A_New_Application_Archive_(WAR)_Remotely > > 2) Make "path" parameter optional in DeployTask of Ant. > > > > 3. If this feature is controlled by a system property, make a > separate property which default depends on STRICT_SERVLET_COMPLIANCE. > > Do not use STRICT_SERVLET_COMPLIANCE directly. > > As this is a deployment feature, I think it makes sense as an > attribute on Host rather that a system property. (Though as I wrong > above, I think we do not need to implement it). > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
svn commit: r1816643 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Author: remm
Date: Wed Nov 29 17:42:16 2017
New Revision: 1816643
URL: http://svn.apache.org/viewvc?rev=1816643&view=rev
Log:
Add back the removal of HTTP mapping override as it matches the javadoc
behavior (it is the same as for include). As this is highly questionable (it is
obvious AsyncContext.dispatch should be equivalent to a forward instead), this
is in the strict compliance flag.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1816643&r1=1816642&r2=1816643&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Wed
Nov 29 17:42:16 2017
@@ -626,7 +626,9 @@ final class ApplicationDispatcher implem
wrequest.setQueryString(queryString);
wrequest.setQueryParams(queryString);
}
-wrequest.setMapping(mapping);
+if (!Globals.STRICT_SERVLET_COMPLIANCE) {
+wrequest.setMapping(mapping);
+}
invoke(state.outerRequest, state.outerResponse, state);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.24
On 28/11/2017 10:12, Violeta Georgieva wrote: > Hi Mark, > > 2017-11-27 15:46 GMT+02:00 Mark Thomas : >> >> The proposed Apache Tomcat 8.5.24 release is now available for voting. >> >> The major changes compared to the 8.5.23 release are: >> >> - Java 9 is fully supported >> >> - Fixed a number of HTTP/2 issues >> >> - Fixed numerous JASPIC issues with patches from Lazar >> >> - Update the packaged version of the Tomcat Native Library to >> 1.2.16 to pick up the latest Windows binaries built with >> APR 1.6.3 and OpenSSL 1.0.2m >> >> >> Along with lots of other bug fixes and improvements. >> >> >> It can be obtained from: >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/ >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-1161/ >> The svn tag is: >> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/ >> >> The proposed 8.5.24 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 8.5.24 > > I'm still testing but I noticed that we miss some files with sha512 checksum > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/bin/embed/ > > The same is for Tomcat 9 artifacts. Hmm. I suspect user error on my part. Let me take a look. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61825] Tomcat8.0.30 Async request happend memory leak
https://bz.apache.org/bugzilla/show_bug.cgi?id=61825 --- Comment #6 from Christopher Schultz --- I'm sorry, I'm no expert on servlet-async so I'm not sure how to answer your question. If there are changes to the async state-machine in Tomcat, those changes will have been made in order to align Tomcat with the published standard, so your product should not have to be customized in any way to work with Tomcat (versus any other Java application server). -- 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 "FAQ/Troubleshooting_and_Diagnostics" by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FAQ/Troubleshooting_and_Diagnostics" page has been changed by
KonstantinKolinko:
https://wiki.apache.org/tomcat/FAQ/Troubleshooting_and_Diagnostics?action=diff&rev1=19&rev2=20
Comment:
Document what is the lifetime of Request/Response objects. Reference the
specification.
E.g. [[https://bz.apache.org/bugzilla/show_bug.cgi?id=61289|61289]],
[[https://bz.apache.org/bugzilla/show_bug.cgi?id=58457|58457]]
- The main suspect is your own web application keeping a reference to Request /
Response objects outside of their life cycle.
+ The main suspect is your own web application keeping a reference to Request /
Response objects outside of their life cycle. (*)
1. Set the following
[[http://tomcat.apache.org/tomcat-8.5-doc/config/systemprops.html#Security|system
property]] in Tomcat configuration:
{{{org.apache.catalina.connector.RECYCLE_FACADES=true}}}
- This flag instructs Tomcat to recycle facades to its internal objects, so
that it is easier to spot illegal access when it happens, instead of waiting
until internal state of referenced object becomes corrupted from concurrent
access.
+ When flag is set, Tomcat recycles facades to its internal objects when
request processing completes. This makes it easier to spot illegal access when
it happens, instead of waiting until side effects of such access become
visible.<><>
+ This flag is also mentioned on the
[[http://tomcat.apache.org/tomcat-8.5-doc/security-howto.html#System_Properties|Security
Considerations]] page. The flag is `true` when Tomcat runs with enabled
[[http://tomcat.apache.org/tomcat-8.5-doc/security-manager-howto.html|Java
Security Manager]].
2. Read about [[FAQ/KnownIssues#ImageIOIssues|Java ImageIO]] issue.
+
+ (*) '''Note'''
+
+ The lifetime of the Response object is documented in the
[[Specifications|Servlet specification]]. Quoting from section "5.8 Lifetime of
the Response Object" of Servlet 4.0 specification:
+
+ || Each response object is valid only within the scope of a servlet’s service
method, or within the scope of a filter’s doFilter method, unless the
associated request object has asynchronous processing enabled for the
component. If asynchronous processing on the associated request is started,
then the response object remains valid until complete method on AsyncContext is
called. ||
+
+ In case of asynchronous processing, when an error occurs Tomcat notifies all
registered `AsyncListener`s and then calls `complete()` automatically if none
of the listeners have called it yet. (Reference:
[[https://bz.apache.org/bugzilla/show_bug.cgi?id=61768#c3|61768]])
+
+ Also see sections "2.3.3.4 Thread Safety" and "3.13 Lifetime of the Request
Object" of the same specification.
[[CategoryFAQ]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1816617 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/des
2017-11-29 15:12 GMT+03:00 Mark Thomas : > On 29/11/17 09:46, r...@apache.org wrote: >> Author: remm >> Date: Wed Nov 29 09:46:00 2017 >> New Revision: 1816617 >> >> URL: http://svn.apache.org/viewvc?rev=1816617&view=rev >> Log: >> Add a bare bones default-context-path impl (best effort really, it's a bad >> feature). Also fix for some mapping paths, excluded pending some >> clarifications. > > I agree that default-context-path is a bad feature. Several comments 1. The default-context-path is declared in web-app_4_0.xsd As such, it should be allowed in the main web.xml only and not in web fragments. It would be strange for a library to dictate what path a web application is deployed under. The same for several other options that are declared in web-app_4_0.xsd only: request-character-encoding response-character-encoding deny-uncovered-http-methods 2. I am -1 to all those STRICT_SERVLET_COMPLIANCE conditionals. My reading of section "30. default-context-path Element" on page 202 of 246 of servlet-4_0_FINAL.pdf (in chapter 14.4 Deployment Descriptor Diagram) is that this feature is only usable at deployment time. I think this is only a hit to an application deployer (the person performing a deployment). Is there some other place in the Spec PDF where this feature is documented? The changelog chapter does not mention other places, and I do not see any others with a quick search. As a similar example: "short-name" in a tld file of a Tag Library is a hint for the prefix used for those tags. It is not the actual prefix. Thus I think that we do not need to change our auto-deployment/deploy-on-startup procedure. I think that this feature belongs to the ways how a web application may be deployed programmatically. E.g.: 1) Make "path" parameter optional in "text/deploy" command of Manager web application, http://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html#Deploy_A_New_Application_Archive_(WAR)_Remotely 2) Make "path" parameter optional in DeployTask of Ant. 3. If this feature is controlled by a system property, make a separate property which default depends on STRICT_SERVLET_COMPLIANCE. Do not use STRICT_SERVLET_COMPLIANCE directly. As this is a deployment feature, I think it makes sense as an attribute on Host rather that a system property. (Though as I wrong above, I think we do not need to implement it). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1816617 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/des
On 29/11/17 13:25, Rémy Maucherat wrote:
> On Wed, Nov 29, 2017 at 1:12 PM, Mark Thomas wrote:
> Yes, I'm aware of the deployer problems, and the rest makes sense too. I
> have no credible way to make it really work right now, unfortunately,
> having to disable the auto deployer makes it unusable (IMO).
>From memory the original use case related to EAR deployments so I'm not
sure if a Tomcat user would ever need it. There is always the wait and
see option. If there is user demand for it then we can try and figure
out how to make it work at that point. We'd have some users to help us
figure out what is and isn't a reasonable restriction on the usage of
the feature.
>> Regarding the mapping path changes...
>>
>>> Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispat
>> cher.java
>>> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/ca
>> talina/core/ApplicationDispatcher.java?rev=1816617&r1=
>> 1816616&r2=1816617&view=diff
>>>
>> ==
>>> --- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
>> (original)
>>> +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
>> Wed Nov 29 09:46:00 2017
>>> @@ -626,7 +626,9 @@ final class ApplicationDispatcher implem
>>> wrequest.setQueryString(queryString);
>>> wrequest.setQueryParams(queryString);
>>> }
>>> -wrequest.setMapping(mapping);
>>> +if (!Globals.STRICT_SERVLET_COMPLIANCE) {
>>> +wrequest.setMapping(mapping);
>>> +}
>>>
>>> invoke(state.outerRequest, state.outerResponse, state);
>>> }
>>
>> -1 (veto) to the above.
>>
>> See the Javadoc:
>>
>> https://javaee.github.io/javaee-spec/javadocs/javax/servlet/
>> http/HttpServletRequest.html#getHttpServletMapping--
>>
>> Also sections 9.3.1 (includes), 9.4.2 (forwards) and 9.7.2 (async
>> dispatches) of the Servlet 4.0 spec.
>>
>> In short, the EG decided to follow the same rules for the mapping as the
>> other request properties.
>>
>
> Actually, the javadoc says AsyncContext.dispatch behaves the same as an
> include (it is odd though, but that's what it says). So I think this one
> should be right.
Hmm. Let me do some more research on that. That certainly isn't my
recollection of the EG discussions. I wonder if something got lost in
translation between the EG and the spec updates or if my memory is
failing me.
Consider my veto withdrawn.
If my memory is correct then +1 to using SERVLET_SPEC_COMPLIANCE to
switch between the current, EG intended behaviour and the behaviour
described by the spec.
>>> Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMappin
>> g.java
>>> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/ca
>> talina/core/ApplicationMapping.java?rev=1816617&r1=1816616&
>> r2=1816617&view=diff
>>>
>> ==
>>> --- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
>> (original)
>>> +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
>> Wed Nov 29 09:46:00 2017
>>> @@ -19,6 +19,7 @@ package org.apache.catalina.core;
>>> import javax.servlet.http.HttpServletMapping;
>>> import javax.servlet.http.MappingMatch;
>>>
>>> +import org.apache.catalina.Globals;
>>> import org.apache.catalina.mapper.MappingData;
>>>
>>> public class ApplicationMapping {
>>> @@ -47,7 +48,8 @@ public class ApplicationMapping {
>>> mapping = new MappingImpl("", "",
>> mappingData.matchType, servletName);
>>> break;
>>> case DEFAULT:
>>> -mapping = new MappingImpl("", "/",
>> mappingData.matchType, servletName);
>>> +String match = Globals.STRICT_SERVLET_COMPLIANCE
>> ? "default" : "";
>>> +mapping = new MappingImpl(match, "/",
>> mappingData.matchType, servletName);
>>> break;
>>> case EXACT:
>>> mapping = new MappingImpl(mappingData.wrappe
>> rPath.toString().substring(1),
>>
>> -1 (veto)
>>
>> See the Javadoc:
>>
>> https://javaee.github.io/javaee-spec/javadocs/javax/servlet/
>> http/HttpServletMapping.html
>>
>> In particular the table in the interface description.
>>
>
> Hm, yes, I don't understand where the thing came from.
>From memory that was one of the options the EG considered but ultimately
rejected.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.2
On Sat, Nov 25, 2017 at 4:36 PM, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.2 release is now available for voting. > > The major changes compared to the 9.0.1 release are: > > - Java 9 is fully supported > > - Fixed numerous JASPIC issues with patches from Lazar > > - Update the packaged version of the Tomcat Native Library to > 1.2.16 to pick up the latest Windows binaries built with > APR 1.6.3 and OpenSSL 1.0.2m > > Along with lots of other bug fixes and improvements. > > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.2/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1160/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/ > > The proposed 9.0.2 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 9.0.2 > [x] Beta - go ahead and release as 9.0.2 +1 > [ ] Stable - go ahead and release as 9.0.2 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.24
On Mon, Nov 27, 2017 at 8:46 AM, Mark Thomas wrote: > The proposed Apache Tomcat 8.5.24 release is now available for voting. > > The major changes compared to the 8.5.23 release are: > > - Java 9 is fully supported > > - Fixed a number of HTTP/2 issues > > - Fixed numerous JASPIC issues with patches from Lazar > > - Update the packaged version of the Tomcat Native Library to > 1.2.16 to pick up the latest Windows binaries built with > APR 1.6.3 and OpenSSL 1.0.2m > > > Along with lots of other bug fixes and improvements. > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1161/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/ > > The proposed 8.5.24 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 8.5.24 +1 > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1816617 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/des
On Wed, Nov 29, 2017 at 1:12 PM, Mark Thomas wrote:
> On 29/11/17 09:46, r...@apache.org wrote:
> > Author: remm
> > Date: Wed Nov 29 09:46:00 2017
> > New Revision: 1816617
> >
> > URL: http://svn.apache.org/viewvc?rev=1816617&view=rev
> > Log:
> > Add a bare bones default-context-path impl (best effort really, it's a
> bad feature). Also fix for some mapping paths, excluded pending some
> clarifications.
>
> I agree that default-context-path is a bad feature.
>
> A small positive is that testing this has highlighted that we were using
> an out of date version of web-app_4_0.xsd. I've updated that and the
> other schemas.
>
> I do like the way you implemented default-context-path. It is a nice
> approach for a truly awful feature. However, there are still issues. The
> ones I've found so far are:
> - the Manager app reports the wrong path so when you click on a link you
> get a 404 (it calls Context.getPath() directly)
> - There are 10s of other calls to Context.getPath() which suggest there
> will be further issues in authentication, dispatching and session
> cookie error messages
> - automatic deployment can replace an app with a default-context-path
> without any warning
>
> I appreciate that this feature is only enabled with
> STRICT_SERVLET_COMPLIANCE but the severity of problems it creates are
> significant.
>
> I don't see any easy way to fix this that doesn't involved adding a fair
> amount of complexity - particularly around auto-deployment. One option
> might be to make enabling of this feature dependent on both
> STRICT_SERVLET_COMPLIANCE and automatic deployment being disabled but
> that would still leave all the Context.getPath() issues to deal with.
>
> It is worth noting from the spec for the default-context-path that
>
> Servlet containers may provide vendor specific configuration
> options that allows specifying a value that overrides the value
> specified here.
>
>
> I would argue that Tomcat's deployment mechanism means that there is
> always "vendor specific configuration" to override any value specified
> for default-context-path and therefore no implementation of this feature
> is necessary.
>
> I am currently very close to vetoing the implementation of this feature
> but I'm going to hold off doing so for now to see if the issues above
> can be resolved without adding too much complexity. I suggest a new
> Context method (e.g. getPathWithDefault() ). This method would return a
> path that takes account of STRICT_SERVLET_COMPLIANCE, automatic
> deployment for the current Host and any default-context-path. Then
> review all the existing calls to Context.getPath() and switching the
> appropriate ones to use the new method. Even then I think there will
> still be issues in the Manager and deploying new apps with conflicting
> paths. It might be necessary to go even further and have an explicit
> option to enable this feature.
>
> For clarity, I don't object at all to parsing the default-context-path
> from web.xml, nor exposing the value via the Context. I'd be happy for
> that code to stay as is.
>
Yes, I'm aware of the deployer problems, and the rest makes sense too. I
have no credible way to make it really work right now, unfortunately,
having to disable the auto deployer makes it unusable (IMO).
>
> Regarding the mapping path changes...
>
> > Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispat
> cher.java
> > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/ca
> talina/core/ApplicationDispatcher.java?rev=1816617&r1=
> 1816616&r2=1816617&view=diff
> >
> ==
> > --- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
> (original)
> > +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
> Wed Nov 29 09:46:00 2017
> > @@ -626,7 +626,9 @@ final class ApplicationDispatcher implem
> > wrequest.setQueryString(queryString);
> > wrequest.setQueryParams(queryString);
> > }
> > -wrequest.setMapping(mapping);
> > +if (!Globals.STRICT_SERVLET_COMPLIANCE) {
> > +wrequest.setMapping(mapping);
> > +}
> >
> > invoke(state.outerRequest, state.outerResponse, state);
> > }
>
> -1 (veto) to the above.
>
> See the Javadoc:
>
> https://javaee.github.io/javaee-spec/javadocs/javax/servlet/
> http/HttpServletRequest.html#getHttpServletMapping--
>
> Also sections 9.3.1 (includes), 9.4.2 (forwards) and 9.7.2 (async
> dispatches) of the Servlet 4.0 spec.
>
> In short, the EG decided to follow the same rules for the mapping as the
> other request properties.
>
Actually, the javadoc says AsyncContext.dispatch behaves the same as an
include (it is odd though, but that's what it says). So I think this one
should be right.
>
>
> > Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMappin
> g.java
> > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apa
svn commit: r1816627 - /tomcat/trunk/build.xml
Author: remm Date: Wed Nov 29 13:11:16 2017 New Revision: 1816627 URL: http://svn.apache.org/viewvc?rev=1816627&view=rev Log: Revert unwanted changes. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1816627&r1=1816626&r2=1816627&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Nov 29 13:11:16 2017 @@ -1594,6 +1594,7 @@ excludeFilter="res/findbugs/filter-false-positives.xml" > + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1816624 - in /tomcat/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/coyote/http2/ ja
Author: remm
Date: Wed Nov 29 12:29:18 2017
New Revision: 1816624
URL: http://svn.apache.org/viewvc?rev=1816624&view=rev
Log:
Revert r1816617
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1816624&r1=1816623&r2=1816624&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Nov 29 12:29:18 2017
@@ -1594,7 +1594,6 @@
excludeFilter="res/findbugs/filter-false-positives.xml" >
-
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1816624&r1=1816623&r2=1816624&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Nov 29 12:29:18 2017
@@ -348,20 +348,6 @@ public interface Context extends Contain
/**
- * Get the best effort path for mapping.
- * @return the default context path
- */
-public String getDefaultContextPath();
-
-
-/**
- * Return the best effort path for mapping.
- * @param defaultContextPath The default context path
- */
-public void setDefaultContextPath(String defaultContextPath);
-
-
-/**
* Return the deny-uncovered-http-methods flag for this web application.
*
* @return The current value of the flag
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1816624&r1=1816623&r2=1816624&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Nov
29 12:29:18 2017
@@ -287,11 +287,7 @@ public class ApplicationContext implemen
@Override
public String getContextPath() {
-if (Globals.STRICT_SERVLET_COMPLIANCE &&
context.getDefaultContextPath() != null) {
-return context.getDefaultContextPath();
-} else {
-return context.getPath();
-}
+return context.getPath();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1816624&r1=1816623&r2=1816624&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Wed
Nov 29 12:29:18 2017
@@ -626,9 +626,7 @@ final class ApplicationDispatcher implem
wrequest.setQueryString(queryString);
wrequest.setQueryParams(queryString);
}
-if (!Globals.STRICT_SERVLET_COMPLIANCE) {
-wrequest.setMapping(mapping);
-}
+wrequest.setMapping(mapping);
invoke(state.outerRequest, state.outerResponse, state);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1816624&r1=1816623&r2=1816624&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Wed Nov
29 12:29:18 2017
@@ -19,7 +19,6 @@ package org.apache.catalina.core;
import javax.servlet.http.HttpServletMapping;
import javax.servlet.http.MappingMatch;
-import org.apache.catalina.Globals;
import org.apache.c
Re: svn commit: r1816617 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/des
On 29/11/17 09:46, r...@apache.org wrote:
> Author: remm
> Date: Wed Nov 29 09:46:00 2017
> New Revision: 1816617
>
> URL: http://svn.apache.org/viewvc?rev=1816617&view=rev
> Log:
> Add a bare bones default-context-path impl (best effort really, it's a bad
> feature). Also fix for some mapping paths, excluded pending some
> clarifications.
I agree that default-context-path is a bad feature.
A small positive is that testing this has highlighted that we were using
an out of date version of web-app_4_0.xsd. I've updated that and the
other schemas.
I do like the way you implemented default-context-path. It is a nice
approach for a truly awful feature. However, there are still issues. The
ones I've found so far are:
- the Manager app reports the wrong path so when you click on a link you
get a 404 (it calls Context.getPath() directly)
- There are 10s of other calls to Context.getPath() which suggest there
will be further issues in authentication, dispatching and session
cookie error messages
- automatic deployment can replace an app with a default-context-path
without any warning
I appreciate that this feature is only enabled with
STRICT_SERVLET_COMPLIANCE but the severity of problems it creates are
significant.
I don't see any easy way to fix this that doesn't involved adding a fair
amount of complexity - particularly around auto-deployment. One option
might be to make enabling of this feature dependent on both
STRICT_SERVLET_COMPLIANCE and automatic deployment being disabled but
that would still leave all the Context.getPath() issues to deal with.
It is worth noting from the spec for the default-context-path that
Servlet containers may provide vendor specific configuration
options that allows specifying a value that overrides the value
specified here.
I would argue that Tomcat's deployment mechanism means that there is
always "vendor specific configuration" to override any value specified
for default-context-path and therefore no implementation of this feature
is necessary.
I am currently very close to vetoing the implementation of this feature
but I'm going to hold off doing so for now to see if the issues above
can be resolved without adding too much complexity. I suggest a new
Context method (e.g. getPathWithDefault() ). This method would return a
path that takes account of STRICT_SERVLET_COMPLIANCE, automatic
deployment for the current Host and any default-context-path. Then
review all the existing calls to Context.getPath() and switching the
appropriate ones to use the new method. Even then I think there will
still be issues in the Manager and deploying new apps with conflicting
paths. It might be necessary to go even further and have an explicit
option to enable this feature.
For clarity, I don't object at all to parsing the default-context-path
from web.xml, nor exposing the value via the Context. I'd be happy for
that code to stay as is.
Regarding the mapping path changes...
> Modified:
> tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1816617&r1=1816616&r2=1816617&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Wed
> Nov 29 09:46:00 2017
> @@ -626,7 +626,9 @@ final class ApplicationDispatcher implem
> wrequest.setQueryString(queryString);
> wrequest.setQueryParams(queryString);
> }
> -wrequest.setMapping(mapping);
> +if (!Globals.STRICT_SERVLET_COMPLIANCE) {
> +wrequest.setMapping(mapping);
> +}
>
> invoke(state.outerRequest, state.outerResponse, state);
> }
-1 (veto) to the above.
See the Javadoc:
https://javaee.github.io/javaee-spec/javadocs/javax/servlet/http/HttpServletRequest.html#getHttpServletMapping--
Also sections 9.3.1 (includes), 9.4.2 (forwards) and 9.7.2 (async
dispatches) of the Servlet 4.0 spec.
In short, the EG decided to follow the same rules for the mapping as the
other request properties.
> Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1816617&r1=1816616&r2=1816617&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Wed
> Nov 29 09:46:00 2017
> @@ -19,6 +19,7 @@ package org.apache.catalina.core;
> import javax.servlet.http.HttpServletMapping;
> import javax.servlet.http.MappingMatch;
>
> +import org.apache.catalina.Globals;
> import org.apache.catalina.mapper.MappingData;
>
> public c
svn commit: r1816622 [1/2] - in /tomcat/trunk: java/javax/servlet/resources/ webapps/docs/
Author: markt
Date: Wed Nov 29 10:46:54 2017
New Revision: 1816622
URL: http://svn.apache.org/viewvc?rev=1816622&view=rev
Log:
Update the Java EE 8 XML schema to the released versions.
- Picks up a couple of element name changes for web .xml
- Lots of whitespace changes (as with the previous versions I converted tabs to
spaces and removed trailing spaces before committing)
- Adds (yes adds!) a handful of typos
- Some additional commentary
No change to licensing. We are electing to distribute under the CDDL.
Modified:
tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_4.xsd
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd
tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff
==
--- tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_8.xsd Wed Nov 29 10:46:54
2017
@@ -1,76 +1,85 @@
-
-http://xmlns.jcp.org/xml/ns/javaee";
- xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="8">
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ or packager/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in
each
+ file and include the License file at packager/legal/LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the
License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the
fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or
GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
+
+ The Apache Software Foundation elects to include this software under the
+ CDDL license.
-
-
- http://www.w3.org/2001/XInclude";
href="license.inc" parse="text"/>
- http://www.w3.org/2001/XInclude";
href="glossary.inc" parse="text"/>
+
+ The following definitions that appear in the common
+ shareable schema(s) of Java EE deployment descriptors should be
+ interpreted with respect to the context they are included:
+
+ Deployment Component may indicate one of the following:
+ java ee application;
+ application client;
+ web application;
+ enterprise bean;
+ resource adapter;
+
+ Deployment File may indicate one of the following:
+ ear file;
+ war file;
+ jar file;
+ rar file;
+
-
http://www.w3.org/XML/1998/namespace";
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-
@@ -99,8 +108,6 @@
-
-
@@ -113,58 +120,72 @@
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ minOccurs="0"
+
svn commit: r1816622 [2/2] - in /tomcat/trunk: java/javax/servlet/resources/ webapps/docs/
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff == --- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd Wed Nov 29 10:46:54 2017 @@ -47,13 +47,9 @@ only if the new code is made subject to such option by the copyright holder. - - - - - The Apache Software Foundation elects to include this software under the CDDL license. + @@ -153,7 +149,7 @@ The jaxrpc-mapping-file element contains the name of a file that -describes the JAX-RPC mapping between the Java interfaces used by +describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module file. @@ -200,13 +196,13 @@ - Declares the handler for a port-component. Handlers can - access the init-param name/value pairs using the - HandlerInfo interface. If port-name is not specified, the - handler is assumed to be associated with all ports of the - service. + Declares the handler for a port-component. Handlers can + access the init-param name/value pairs using the + HandlerInfo interface. If port-name is not specified, the + handler is assumed to be associated with all ports of the + service. - To be used with JAX-RPC based runtime only. + To be used with JAX-RPC based runtime only. @@ -218,7 +214,7 @@ - To be used with JAX-WS based runtime only. + To be used with JAX-WS based runtime only. @@ -488,31 +484,31 @@ Exact Name: service-name-pattern="ns1:EchoService" -In this case, handlers specified in this -handler-chain element will apply to all ports with -this exact service name. The namespace prefix must -have been declared in a namespace declaration -attribute in either the start-tag of the element -where the prefix is used or in an an ancestor -element (i.e. an element in whose content the -prefixed markup occurs) + In this case, handlers specified in this + handler-chain element will apply to all ports with + this exact service name. The namespace prefix must + have been declared in a namespace declaration + attribute in either the start-tag of the element + where the prefix is used or in an an ancestor + element (i.e. an element in whose content the + prefixed markup occurs) Pattern : service-name-pattern="ns1:EchoService*" -In this case, handlers specified in this -handler-chain element will apply to all ports whose -Service names are like EchoService1, EchoServiceFoo -etc. The namespace prefix must have been declared in -a namespace declaration attribute in either the -start-tag of the element where the prefix is used or -in an an ancestor element (i.e. an element in whose -content the prefixed markup occurs) + In this case, handlers specified in this + handler-chain element will apply to all ports whose + Service names are like EchoService1, EchoServiceFoo + etc. The namespace prefix must have been declared in + a namespace declaration attribute in either the + start-tag of the element where the prefix is used or + in an an ancestor element (i.e. an element in whose + content the prefixed markup occurs) Wild Card : service-name-pattern="*" -In this case, handlers specified in this handler-chain -element will apply to ports of all service names. +In this case, handlers specified in this handler-chain +element will apply to ports of all service names. The same can be applied to port-name attribute in handler-chain element. Modified: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff == --- tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (original) +++ tomcat/trunk/java/java
svn commit: r1816617 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/descrip
Author: remm
Date: Wed Nov 29 09:46:00 2017
New Revision: 1816617
URL: http://svn.apache.org/viewvc?rev=1816617&view=rev
Log:
Add a bare bones default-context-path impl (best effort really, it's a bad
feature). Also fix for some mapping paths, excluded pending some clarifications.
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1816617&r1=1816616&r2=1816617&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Nov 29 09:46:00 2017
@@ -348,6 +348,20 @@ public interface Context extends Contain
/**
+ * Get the best effort path for mapping.
+ * @return the default context path
+ */
+public String getDefaultContextPath();
+
+
+/**
+ * Return the best effort path for mapping.
+ * @param defaultContextPath The default context path
+ */
+public void setDefaultContextPath(String defaultContextPath);
+
+
+/**
* Return the deny-uncovered-http-methods flag for this web application.
*
* @return The current value of the flag
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1816617&r1=1816616&r2=1816617&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Nov
29 09:46:00 2017
@@ -287,7 +287,11 @@ public class ApplicationContext implemen
@Override
public String getContextPath() {
-return context.getPath();
+if (Globals.STRICT_SERVLET_COMPLIANCE &&
context.getDefaultContextPath() != null) {
+return context.getDefaultContextPath();
+} else {
+return context.getPath();
+}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1816617&r1=1816616&r2=1816617&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Wed
Nov 29 09:46:00 2017
@@ -626,7 +626,9 @@ final class ApplicationDispatcher implem
wrequest.setQueryString(queryString);
wrequest.setQueryParams(queryString);
}
-wrequest.setMapping(mapping);
+if (!Globals.STRICT_SERVLET_COMPLIANCE) {
+wrequest.setMapping(mapping);
+}
invoke(state.outerRequest, state.outerResponse, state);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1816617&r1=1816616&r2=1816617&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Wed Nov
29 09:46:00 2017
@@ -19,6 +19,7 @@ package org.apache.catalina.core;
import javax.servlet.http.HttpServletMapping;
import javax.servlet.http.MappingMatch;
+import org.apache.catalina.Globals;
import org.apache.catalina.mapper.MappingData;
public class ApplicationMapping {
@@ -47,7 +48,8 @@ public class ApplicationMapping {
mapping = new MappingImpl("", "",
mappingData.matchType, servletName);
break;
case DEFAULT:
-mapping = new MappingImpl("", "/",
mappingData.matchType, servletName);
+Strin
