[Bug 64506] NullPointerException when loading webapp class
https://bz.apache.org/bugzilla/show_bug.cgi?id=64506 --- Comment #6 from Arvind Talari --- Mark, Tested the fix with a simulated race condition, and it worked. Thanks again for the quick turn around. -- 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
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1724 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] aa5fda89d07afc2118be51b85f85a3a0f6f8c225 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2360 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 808e9173f42596608fecc450978bf58e872218a6 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/292 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] dd8236073d500ca056664b8f89997ae36050f918 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Unit tests need all i18n files on class path
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new aa5fda8 Unit tests need all i18n files on class path aa5fda8 is described below commit aa5fda89d07afc2118be51b85f85a3a0f6f8c225 Author: Mark Thomas AuthorDate: Mon Jun 15 23:20:53 2020 +0100 Unit tests need all i18n files on class path --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index e475f01..9412e4a 100644 --- a/build.xml +++ b/build.xml @@ -232,6 +232,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Unit tests need all i18n files on class path
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 808e917 Unit tests need all i18n files on class path 808e917 is described below commit 808e9173f42596608fecc450978bf58e872218a6 Author: Mark Thomas AuthorDate: Mon Jun 15 23:20:53 2020 +0100 Unit tests need all i18n files on class path --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 28f5aa3..480b422 100644 --- a/build.xml +++ b/build.xml @@ -228,6 +228,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Unit tests need all i18n files on class path
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 2382bf5 Unit tests need all i18n files on class path 2382bf5 is described below commit 2382bf5fa06ee2d6e46c0f7651f3220389822d16 Author: Mark Thomas AuthorDate: Mon Jun 15 23:20:53 2020 +0100 Unit tests need all i18n files on class path --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 6303917..b77c03f 100644 --- a/build.xml +++ b/build.xml @@ -235,6 +235,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Unit tests need all i18n files on class path
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new dd82360 Unit tests need all i18n files on class path dd82360 is described below commit dd8236073d500ca056664b8f89997ae36050f918 Author: Mark Thomas AuthorDate: Mon Jun 15 23:20:53 2020 +0100 Unit tests need all i18n files on class path --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index f06cea5..dccfc78 100644 --- a/build.xml +++ b/build.xml @@ -231,6 +231,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/291 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 2e3292574456ae1fa1c2eece5b934fd3cdc65f7f Blamelist: Raymond Augé BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1723 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] b77ab12595514e5bd6efe72c43943be844c97712 Blamelist: Raymond Augé BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2359 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 5288a5bccb5297e93ada9789a024e1dfbde6394e Blamelist: Raymond Augé BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5249 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 60dcf7ca2d5c953200f8dfe6fc13097d8b20b526 Blamelist: Raymond Augé BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64431] Enable response compression by default
https://bz.apache.org/bugzilla/show_bug.cgi?id=64431 Mark Thomas changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #7 from Mark Thomas --- There wasn't much community feedback, but the feedback that there was was that it would be best to leave the compression setting as is. Reasons mentioned included: - interaction with some clients (still!) - behaviour behind a reverse proxies generally - interaction with CDNs specifically I am therefore resolving this as WONTFIX. -- 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 64521] avoid moving i18n translations into classes dir since they are packaged into separate jars
https://bz.apache.org/bugzilla/show_bug.cgi?id=64521 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- Fixed in: - master for 10.0.0-M7 onwards - 9.0.x for 9.0.37 onwards - 8.5.x for 8.5.57 onwards - 7.0.x for 7.0.105 onwards Thanks for the PR. -- 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
[GitHub] [tomcat] markt-asf commented on pull request #300: Fix BZ 64521 - avoid moving i18n translations into classes dir since …
markt-asf commented on pull request #300: URL: https://github.com/apache/tomcat/pull/300#issuecomment-644315074 Merged on command line due to conflicts. Thanks for the PR. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #300: Fix BZ 64521 - avoid moving i18n translations into classes dir since …
markt-asf closed pull request #300: URL: https://github.com/apache/tomcat/pull/300 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new b77ab12 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars b77ab12 is described below commit b77ab12595514e5bd6efe72c43943be844c97712 Author: Raymond Augé AuthorDate: Sat Jun 13 17:19:29 2020 -0400 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars Signed-off-by: Raymond Augé --- build.xml | 21 +++-- webapps/docs/changelog.xml | 5 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index 64da7e7..e475f01 100644 --- a/build.xml +++ b/build.xml @@ -540,6 +540,7 @@ + @@ -725,7 +726,8 @@ - + + @@ -862,7 +864,7 @@ - + - + - + - + - + - + - + - + - diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index bcba434..0230a60 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,6 +122,11 @@ LOGGING_CONFIG environment variable to avoid using a POSIX shell feature that is not available by default on Solaris 10. (markt) + +64521: Avoid moving i18n translations into classes dir since +they are packaged into separate jars. Pull request provided by Raymond +Augé. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 5288a5b Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars 5288a5b is described below commit 5288a5bccb5297e93ada9789a024e1dfbde6394e Author: Raymond Augé AuthorDate: Sat Jun 13 17:19:29 2020 -0400 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars Signed-off-by: Raymond Augé --- build.xml | 21 +++-- webapps/docs/changelog.xml | 5 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index 3827617..28f5aa3 100644 --- a/build.xml +++ b/build.xml @@ -540,6 +540,7 @@ + @@ -720,7 +721,8 @@ - + + @@ -870,7 +872,7 @@ - + - + - + - + - + - + - + - + - diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2481caf..da9b0bc 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -99,6 +99,11 @@ to address packaging/dependency concerns for JPMS and OSGi. Pull request provided by Raymond Augé. (markt) + +64521: Avoid moving i18n translations into classes dir since +they are packaged into separate jars. Pull request provided by Raymond +Augé. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 2e32925 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars 2e32925 is described below commit 2e3292574456ae1fa1c2eece5b934fd3cdc65f7f Author: Raymond Augé AuthorDate: Sat Jun 13 17:19:29 2020 -0400 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars Signed-off-by: Raymond Augé --- build.xml | 25 + webapps/docs/changelog.xml | 5 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/build.xml b/build.xml index f22ce5f..f06cea5 100644 --- a/build.xml +++ b/build.xml @@ -536,6 +536,7 @@ + @@ -717,7 +718,8 @@ - + + @@ -893,7 +895,7 @@ - + - + - + - + - + - + - + - + - + - + - diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4518796..2d3c18f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -114,6 +114,11 @@ to address packaging/dependency concerns for JPMS and OSGi. Pull request provided by Raymond Augé. (markt) + +64521: Avoid moving i18n translations into classes dir since +they are packaged into separate jars. Pull request provided by Raymond +Augé. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 60dcf7c Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars 60dcf7c is described below commit 60dcf7ca2d5c953200f8dfe6fc13097d8b20b526 Author: Raymond Augé AuthorDate: Sat Jun 13 17:19:29 2020 -0400 Fix BZ 64521 - avoid moving i18n translations into classes dir since they are packaged into separate jars Signed-off-by: Raymond Augé --- build.xml | 25 + webapps/docs/changelog.xml | 5 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/build.xml b/build.xml index e6beaf0..6303917 100644 --- a/build.xml +++ b/build.xml @@ -540,6 +540,7 @@ + @@ -727,7 +728,8 @@ - + + @@ -909,7 +911,7 @@ - + - + - + - + - + - + - + - + - + - + - diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index daaedda..b181385 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -128,6 +128,11 @@ to address packaging/dependency concerns for JPMS and OSGi. Pull request provided by Raymond Augé. (markt) + +64521: Avoid moving i18n translations into classes dir since +they are packaged into separate jars. Pull request provided by Raymond +Augé. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64514] classes missing from bootstrap.jar
https://bz.apache.org/bugzilla/show_bug.cgi?id=64514 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #4 from Mark Thomas --- Thanks for the PRs. Fixed in: - master for 10.0.0-M7 onwards - 9.0.x for 9.0.37 onwards - 8.5.x for 8.5.57 onwards Note that I back-ported this to 8.5.x even though 8.5.x doesn't use bnd to keep the code in sync for easier back-ports of future fixes. -- 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] branch 8.5.x updated: Fix BZ 64514 - classes missing from bootstrap.jar
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6a3ab48 Fix BZ 64514 - classes missing from bootstrap.jar
6a3ab48 is described below
commit 6a3ab48001d136bf794fadc7ca55905b6f98065a
Author: Raymond Augé
AuthorDate: Thu Jun 11 16:44:24 2020 -0400
Fix BZ 64514 - classes missing from bootstrap.jar
Signed-off-by: Raymond Augé
---
build.xml | 1 +
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/startup/Bootstrap.java | 26 +
java/org/apache/catalina/startup/Constants.java | 12
java/org/apache/catalina/startup/Tool.java | 16 +++
webapps/docs/changelog.xml | 5 +
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 91929a4..3827617 100644
--- a/build.xml
+++ b/build.xml
@@ -365,6 +365,7 @@
+
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index addbdca..52a9f96 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -274,14 +274,14 @@ public final class Globals {
* Name of the system property containing
* the tomcat product installation path
*/
-public static final String CATALINA_HOME_PROP = "catalina.home";
+public static final String CATALINA_HOME_PROP =
org.apache.catalina.startup.Constants.CATALINA_HOME_PROP;
/**
* Name of the system property containing
* the tomcat instance installation path
*/
-public static final String CATALINA_BASE_PROP = "catalina.base";
+public static final String CATALINA_BASE_PROP =
org.apache.catalina.startup.Constants.CATALINA_BASE_PROP;
// Global
constants
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index fdb5266..f52ceca 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityClassLoad;
import org.apache.catalina.startup.ClassLoaderFactory.Repository;
import org.apache.catalina.startup.ClassLoaderFactory.RepositoryType;
@@ -66,7 +65,7 @@ public final class Bootstrap {
String userDir = System.getProperty("user.dir");
// Home first
-String home = System.getProperty(Globals.CATALINA_HOME_PROP);
+String home = System.getProperty(Constants.CATALINA_HOME_PROP);
File homeFile = null;
if (home != null) {
@@ -105,10 +104,10 @@ public final class Bootstrap {
catalinaHomeFile = homeFile;
System.setProperty(
-Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
+Constants.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
-String base = System.getProperty(Globals.CATALINA_BASE_PROP);
+String base = System.getProperty(Constants.CATALINA_BASE_PROP);
if (base == null) {
catalinaBaseFile = catalinaHomeFile;
} else {
@@ -121,7 +120,7 @@ public final class Bootstrap {
catalinaBaseFile = baseFile;
}
System.setProperty(
-Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
+Constants.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -- Variables
@@ -222,9 +221,9 @@ public final class Bootstrap {
String replacement;
if (propName.length() == 0) {
replacement = null;
-} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+} else if (Constants.CATALINA_HOME_PROP.equals(propName)) {
replacement = getCatalinaHome();
-} else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+} else if (Constants.CATALINA_BASE_PROP.equals(propName)) {
replacement = getCatalinaBase();
} else {
replacement = System.getProperty(propName);
@@ -542,16 +541,27 @@ public final class Bootstrap {
// Copied from ExceptionUtils since that class is not visible during start
-private static void handleThrowable(Throwable t) {
+static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow sile
[tomcat] branch 9.0.x updated: Fix BZ 64514 - classes missing from bootstrap.jar
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 15377cb Fix BZ 64514 - classes missing from bootstrap.jar
15377cb is described below
commit 15377cbe5a71f27774befffc65d03228e73432a6
Author: Raymond Augé
AuthorDate: Thu Jun 11 16:44:24 2020 -0400
Fix BZ 64514 - classes missing from bootstrap.jar
Signed-off-by: Raymond Augé
---
build.xml | 1 +
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/startup/Bootstrap.java | 26 +
java/org/apache/catalina/startup/Constants.java | 12
java/org/apache/catalina/startup/Tool.java | 16 +++
webapps/docs/changelog.xml | 5 +
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 56c157b..f22ce5f 100644
--- a/build.xml
+++ b/build.xml
@@ -366,6 +366,7 @@
+
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index addbdca..52a9f96 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -274,14 +274,14 @@ public final class Globals {
* Name of the system property containing
* the tomcat product installation path
*/
-public static final String CATALINA_HOME_PROP = "catalina.home";
+public static final String CATALINA_HOME_PROP =
org.apache.catalina.startup.Constants.CATALINA_HOME_PROP;
/**
* Name of the system property containing
* the tomcat instance installation path
*/
-public static final String CATALINA_BASE_PROP = "catalina.base";
+public static final String CATALINA_BASE_PROP =
org.apache.catalina.startup.Constants.CATALINA_BASE_PROP;
// Global
constants
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 98f035a..579dc00 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityClassLoad;
import org.apache.catalina.startup.ClassLoaderFactory.Repository;
import org.apache.catalina.startup.ClassLoaderFactory.RepositoryType;
@@ -66,7 +65,7 @@ public final class Bootstrap {
String userDir = System.getProperty("user.dir");
// Home first
-String home = System.getProperty(Globals.CATALINA_HOME_PROP);
+String home = System.getProperty(Constants.CATALINA_HOME_PROP);
File homeFile = null;
if (home != null) {
@@ -105,10 +104,10 @@ public final class Bootstrap {
catalinaHomeFile = homeFile;
System.setProperty(
-Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
+Constants.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
-String base = System.getProperty(Globals.CATALINA_BASE_PROP);
+String base = System.getProperty(Constants.CATALINA_BASE_PROP);
if (base == null) {
catalinaBaseFile = catalinaHomeFile;
} else {
@@ -121,7 +120,7 @@ public final class Bootstrap {
catalinaBaseFile = baseFile;
}
System.setProperty(
-Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
+Constants.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -- Variables
@@ -222,9 +221,9 @@ public final class Bootstrap {
String replacement;
if (propName.length() == 0) {
replacement = null;
-} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+} else if (Constants.CATALINA_HOME_PROP.equals(propName)) {
replacement = getCatalinaHome();
-} else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+} else if (Constants.CATALINA_BASE_PROP.equals(propName)) {
replacement = getCatalinaBase();
} else {
replacement = System.getProperty(propName);
@@ -542,16 +541,27 @@ public final class Bootstrap {
// Copied from ExceptionUtils since that class is not visible during start
-private static void handleThrowable(Throwable t) {
+static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow sile
[tomcat] branch master updated: Fix BZ 64514 - classes missing from bootstrap.jar
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d3d846c Fix BZ 64514 - classes missing from bootstrap.jar
d3d846c is described below
commit d3d846c76e088aaa3291bcdc1502e0563f1dc6ae
Author: Raymond Augé
AuthorDate: Thu Jun 11 16:44:24 2020 -0400
Fix BZ 64514 - classes missing from bootstrap.jar
Signed-off-by: Raymond Augé
---
build.xml | 1 +
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/startup/Bootstrap.java | 26 +
java/org/apache/catalina/startup/Constants.java | 12
java/org/apache/catalina/startup/Tool.java | 16 +++
webapps/docs/changelog.xml | 5 +
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 931524c..e6beaf0 100644
--- a/build.xml
+++ b/build.xml
@@ -370,6 +370,7 @@
+
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index eec8215..d2e8698 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -258,14 +258,14 @@ public final class Globals {
* Name of the system property containing
* the tomcat product installation path
*/
-public static final String CATALINA_HOME_PROP = "catalina.home";
+public static final String CATALINA_HOME_PROP =
org.apache.catalina.startup.Constants.CATALINA_HOME_PROP;
/**
* Name of the system property containing
* the tomcat instance installation path
*/
-public static final String CATALINA_BASE_PROP = "catalina.base";
+public static final String CATALINA_BASE_PROP =
org.apache.catalina.startup.Constants.CATALINA_BASE_PROP;
// Global
constants
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 98f035a..579dc00 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityClassLoad;
import org.apache.catalina.startup.ClassLoaderFactory.Repository;
import org.apache.catalina.startup.ClassLoaderFactory.RepositoryType;
@@ -66,7 +65,7 @@ public final class Bootstrap {
String userDir = System.getProperty("user.dir");
// Home first
-String home = System.getProperty(Globals.CATALINA_HOME_PROP);
+String home = System.getProperty(Constants.CATALINA_HOME_PROP);
File homeFile = null;
if (home != null) {
@@ -105,10 +104,10 @@ public final class Bootstrap {
catalinaHomeFile = homeFile;
System.setProperty(
-Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
+Constants.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
-String base = System.getProperty(Globals.CATALINA_BASE_PROP);
+String base = System.getProperty(Constants.CATALINA_BASE_PROP);
if (base == null) {
catalinaBaseFile = catalinaHomeFile;
} else {
@@ -121,7 +120,7 @@ public final class Bootstrap {
catalinaBaseFile = baseFile;
}
System.setProperty(
-Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
+Constants.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -- Variables
@@ -222,9 +221,9 @@ public final class Bootstrap {
String replacement;
if (propName.length() == 0) {
replacement = null;
-} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+} else if (Constants.CATALINA_HOME_PROP.equals(propName)) {
replacement = getCatalinaHome();
-} else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+} else if (Constants.CATALINA_BASE_PROP.equals(propName)) {
replacement = getCatalinaBase();
} else {
replacement = System.getProperty(propName);
@@ -542,16 +541,27 @@ public final class Bootstrap {
// Copied from ExceptionUtils since that class is not visible during start
-private static void handleThrowable(Throwable t) {
+static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow si
[GitHub] [tomcat] markt-asf closed pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar
markt-asf closed pull request #298: URL: https://github.com/apache/tomcat/pull/298 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 64514 - classes missing from bootstrap.jar
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 15377cb Fix BZ 64514 - classes missing from bootstrap.jar
15377cb is described below
commit 15377cbe5a71f27774befffc65d03228e73432a6
Author: Raymond Augé
AuthorDate: Thu Jun 11 16:44:24 2020 -0400
Fix BZ 64514 - classes missing from bootstrap.jar
Signed-off-by: Raymond Augé
---
build.xml | 1 +
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/startup/Bootstrap.java | 26 +
java/org/apache/catalina/startup/Constants.java | 12
java/org/apache/catalina/startup/Tool.java | 16 +++
webapps/docs/changelog.xml | 5 +
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 56c157b..f22ce5f 100644
--- a/build.xml
+++ b/build.xml
@@ -366,6 +366,7 @@
+
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index addbdca..52a9f96 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -274,14 +274,14 @@ public final class Globals {
* Name of the system property containing
* the tomcat product installation path
*/
-public static final String CATALINA_HOME_PROP = "catalina.home";
+public static final String CATALINA_HOME_PROP =
org.apache.catalina.startup.Constants.CATALINA_HOME_PROP;
/**
* Name of the system property containing
* the tomcat instance installation path
*/
-public static final String CATALINA_BASE_PROP = "catalina.base";
+public static final String CATALINA_BASE_PROP =
org.apache.catalina.startup.Constants.CATALINA_BASE_PROP;
// Global
constants
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 98f035a..579dc00 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityClassLoad;
import org.apache.catalina.startup.ClassLoaderFactory.Repository;
import org.apache.catalina.startup.ClassLoaderFactory.RepositoryType;
@@ -66,7 +65,7 @@ public final class Bootstrap {
String userDir = System.getProperty("user.dir");
// Home first
-String home = System.getProperty(Globals.CATALINA_HOME_PROP);
+String home = System.getProperty(Constants.CATALINA_HOME_PROP);
File homeFile = null;
if (home != null) {
@@ -105,10 +104,10 @@ public final class Bootstrap {
catalinaHomeFile = homeFile;
System.setProperty(
-Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
+Constants.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
-String base = System.getProperty(Globals.CATALINA_BASE_PROP);
+String base = System.getProperty(Constants.CATALINA_BASE_PROP);
if (base == null) {
catalinaBaseFile = catalinaHomeFile;
} else {
@@ -121,7 +120,7 @@ public final class Bootstrap {
catalinaBaseFile = baseFile;
}
System.setProperty(
-Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
+Constants.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -- Variables
@@ -222,9 +221,9 @@ public final class Bootstrap {
String replacement;
if (propName.length() == 0) {
replacement = null;
-} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+} else if (Constants.CATALINA_HOME_PROP.equals(propName)) {
replacement = getCatalinaHome();
-} else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+} else if (Constants.CATALINA_BASE_PROP.equals(propName)) {
replacement = getCatalinaBase();
} else {
replacement = System.getProperty(propName);
@@ -542,16 +541,27 @@ public final class Bootstrap {
// Copied from ExceptionUtils since that class is not visible during start
-private static void handleThrowable(Throwable t) {
+static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow sile
[tomcat] branch master updated: Fix BZ 64514 - classes missing from bootstrap.jar
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d3d846c Fix BZ 64514 - classes missing from bootstrap.jar
d3d846c is described below
commit d3d846c76e088aaa3291bcdc1502e0563f1dc6ae
Author: Raymond Augé
AuthorDate: Thu Jun 11 16:44:24 2020 -0400
Fix BZ 64514 - classes missing from bootstrap.jar
Signed-off-by: Raymond Augé
---
build.xml | 1 +
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/startup/Bootstrap.java | 26 +
java/org/apache/catalina/startup/Constants.java | 12
java/org/apache/catalina/startup/Tool.java | 16 +++
webapps/docs/changelog.xml | 5 +
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 931524c..e6beaf0 100644
--- a/build.xml
+++ b/build.xml
@@ -370,6 +370,7 @@
+
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index eec8215..d2e8698 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -258,14 +258,14 @@ public final class Globals {
* Name of the system property containing
* the tomcat product installation path
*/
-public static final String CATALINA_HOME_PROP = "catalina.home";
+public static final String CATALINA_HOME_PROP =
org.apache.catalina.startup.Constants.CATALINA_HOME_PROP;
/**
* Name of the system property containing
* the tomcat instance installation path
*/
-public static final String CATALINA_BASE_PROP = "catalina.base";
+public static final String CATALINA_BASE_PROP =
org.apache.catalina.startup.Constants.CATALINA_BASE_PROP;
// Global
constants
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 98f035a..579dc00 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityClassLoad;
import org.apache.catalina.startup.ClassLoaderFactory.Repository;
import org.apache.catalina.startup.ClassLoaderFactory.RepositoryType;
@@ -66,7 +65,7 @@ public final class Bootstrap {
String userDir = System.getProperty("user.dir");
// Home first
-String home = System.getProperty(Globals.CATALINA_HOME_PROP);
+String home = System.getProperty(Constants.CATALINA_HOME_PROP);
File homeFile = null;
if (home != null) {
@@ -105,10 +104,10 @@ public final class Bootstrap {
catalinaHomeFile = homeFile;
System.setProperty(
-Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
+Constants.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
-String base = System.getProperty(Globals.CATALINA_BASE_PROP);
+String base = System.getProperty(Constants.CATALINA_BASE_PROP);
if (base == null) {
catalinaBaseFile = catalinaHomeFile;
} else {
@@ -121,7 +120,7 @@ public final class Bootstrap {
catalinaBaseFile = baseFile;
}
System.setProperty(
-Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
+Constants.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -- Variables
@@ -222,9 +221,9 @@ public final class Bootstrap {
String replacement;
if (propName.length() == 0) {
replacement = null;
-} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+} else if (Constants.CATALINA_HOME_PROP.equals(propName)) {
replacement = getCatalinaHome();
-} else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+} else if (Constants.CATALINA_BASE_PROP.equals(propName)) {
replacement = getCatalinaBase();
} else {
replacement = System.getProperty(propName);
@@ -542,16 +541,27 @@ public final class Bootstrap {
// Copied from ExceptionUtils since that class is not visible during start
-private static void handleThrowable(Throwable t) {
+static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow si
[GitHub] [tomcat] markt-asf commented on pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar
markt-asf commented on pull request #298: URL: https://github.com/apache/tomcat/pull/298#issuecomment-644308328 Fixed via back-port (cherry-pick) of 10.0.x fix This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64514 - classes missing from bootstrap.jar
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d3d846c Fix BZ 64514 - classes missing from bootstrap.jar
d3d846c is described below
commit d3d846c76e088aaa3291bcdc1502e0563f1dc6ae
Author: Raymond Augé
AuthorDate: Thu Jun 11 16:44:24 2020 -0400
Fix BZ 64514 - classes missing from bootstrap.jar
Signed-off-by: Raymond Augé
---
build.xml | 1 +
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/startup/Bootstrap.java | 26 +
java/org/apache/catalina/startup/Constants.java | 12
java/org/apache/catalina/startup/Tool.java | 16 +++
webapps/docs/changelog.xml | 5 +
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 931524c..e6beaf0 100644
--- a/build.xml
+++ b/build.xml
@@ -370,6 +370,7 @@
+
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index eec8215..d2e8698 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -258,14 +258,14 @@ public final class Globals {
* Name of the system property containing
* the tomcat product installation path
*/
-public static final String CATALINA_HOME_PROP = "catalina.home";
+public static final String CATALINA_HOME_PROP =
org.apache.catalina.startup.Constants.CATALINA_HOME_PROP;
/**
* Name of the system property containing
* the tomcat instance installation path
*/
-public static final String CATALINA_BASE_PROP = "catalina.base";
+public static final String CATALINA_BASE_PROP =
org.apache.catalina.startup.Constants.CATALINA_BASE_PROP;
// Global
constants
diff --git a/java/org/apache/catalina/startup/Bootstrap.java
b/java/org/apache/catalina/startup/Bootstrap.java
index 98f035a..579dc00 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityClassLoad;
import org.apache.catalina.startup.ClassLoaderFactory.Repository;
import org.apache.catalina.startup.ClassLoaderFactory.RepositoryType;
@@ -66,7 +65,7 @@ public final class Bootstrap {
String userDir = System.getProperty("user.dir");
// Home first
-String home = System.getProperty(Globals.CATALINA_HOME_PROP);
+String home = System.getProperty(Constants.CATALINA_HOME_PROP);
File homeFile = null;
if (home != null) {
@@ -105,10 +104,10 @@ public final class Bootstrap {
catalinaHomeFile = homeFile;
System.setProperty(
-Globals.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
+Constants.CATALINA_HOME_PROP, catalinaHomeFile.getPath());
// Then base
-String base = System.getProperty(Globals.CATALINA_BASE_PROP);
+String base = System.getProperty(Constants.CATALINA_BASE_PROP);
if (base == null) {
catalinaBaseFile = catalinaHomeFile;
} else {
@@ -121,7 +120,7 @@ public final class Bootstrap {
catalinaBaseFile = baseFile;
}
System.setProperty(
-Globals.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
+Constants.CATALINA_BASE_PROP, catalinaBaseFile.getPath());
}
// -- Variables
@@ -222,9 +221,9 @@ public final class Bootstrap {
String replacement;
if (propName.length() == 0) {
replacement = null;
-} else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+} else if (Constants.CATALINA_HOME_PROP.equals(propName)) {
replacement = getCatalinaHome();
-} else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+} else if (Constants.CATALINA_BASE_PROP.equals(propName)) {
replacement = getCatalinaBase();
} else {
replacement = System.getProperty(propName);
@@ -542,16 +541,27 @@ public final class Bootstrap {
// Copied from ExceptionUtils since that class is not visible during start
-private static void handleThrowable(Throwable t) {
+static void handleThrowable(Throwable t) {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
+if (t instanceof StackOverflowError) {
+// Swallow si
[GitHub] [tomcat] markt-asf closed pull request #296: Fix BZ 64514 - classes missing from bootstrap.jar
markt-asf closed pull request #296: URL: https://github.com/apache/tomcat/pull/296 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #296: Fix BZ 64514 - classes missing from bootstrap.jar
markt-asf commented on pull request #296: URL: https://github.com/apache/tomcat/pull/296#issuecomment-644307300 Merged via the command line This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-connectors] branch master updated: Make pcre.lib as pseudotarget, so nmake can check for changes
This is an automated email from the ASF dual-hosted git repository. mturk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git The following commit(s) were added to refs/heads/master by this push: new d06318a Make pcre.lib as pseudotarget, so nmake can check for changes d06318a is described below commit d06318a17009cd86f7e83700df8a3f6de09e1619 Author: Mladen Turk AuthorDate: Mon Jun 15 19:32:40 2020 +0200 Make pcre.lib as pseudotarget, so nmake can check for changes --- native/iis/Makefile.vc | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc index 21c7f87..4422af0 100644 --- a/native/iis/Makefile.vc +++ b/native/iis/Makefile.vc @@ -74,7 +74,7 @@ OBJECTS = \ $(WORKDIR)\jk_util.obj \ $(WORKDIR)\jk_worker.obj -all : $(WORKDIR) $(PCRELIB) $(BUILDBIN) +all : libpcre $(WORKDIR) $(BUILDBIN) $(WORKDIR) : @$(MAKEWORKDIR) @@ -88,20 +88,18 @@ $(WORKDIR) : $(BUILDRES): ..\common\jk.rc $(RC) /l 0x409 /n /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) ..\common\jk.rc -$(PCRELIB): +libpcre: @cd .\pcre - $(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)" - @if not ERRORLEVEL 0 exit /B 1 + @$(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)" @cd .. -$(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES) +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) /def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB) @if exist $(BUILDMFT) \ $(MT) -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 clean: @cd .\pcre - $(MAKE) -f Makefile.vc clean - @if not ERRORLEVEL 0 exit /B 1 + @$(MAKE) -f Makefile.vc clean @cd .. @-$(CLEANTARGET) 2>NUL - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #293: Fix IPUtils.canonize() to return a valid IPv6 address
markt-asf commented on pull request #293: URL: https://github.com/apache/tomcat/pull/293#issuecomment-644253174 Thanks for the PR. I applied it manually: - because I had renamed the test class - so I could include a changelog entry - because the changes to the test code wouldn't compile This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #293: Fix IPUtils.canonize() to return a valid IPv6 address
markt-asf closed pull request #293: URL: https://github.com/apache/tomcat/pull/293 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix canonicalization of IPv6 addresses ending in "::"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new debeb6c Fix canonicalization of IPv6 addresses ending in "::"
debeb6c is described below
commit debeb6cc98ab617d7e4d17745fe43f278de904a0
Author: Mark Thomas
AuthorDate: Mon Jun 15 17:55:38 2020 +0100
Fix canonicalization of IPv6 addresses ending in "::"
Based on a patch by syarramsetty-skyhook
---
java/org/apache/tomcat/util/net/IPv6Utils.java | 2 +-
test/org/apache/tomcat/util/net/TestIPv6Utils.java | 3 +++
webapps/docs/changelog.xml | 5 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/IPv6Utils.java
b/java/org/apache/tomcat/util/net/IPv6Utils.java
index 94b8c49..bccc0a2 100644
--- a/java/org/apache/tomcat/util/net/IPv6Utils.java
+++ b/java/org/apache/tomcat/util/net/IPv6Utils.java
@@ -109,7 +109,7 @@ public class IPv6Utils {
int length = ipv6AddressLength;
int change = 0;
-if (colonsPos >= 0 && colonsPos < ipv6AddressLength - 2) {
+if (colonsPos >= 0 && colonsPos < ipv6AddressLength - 1) {
int colonCounter = 0;
for (int i = 0; i < ipv6AddressLength; i++) {
if (ipv6Address.charAt(i) == ':') {
diff --git a/test/org/apache/tomcat/util/net/TestIPv6Utils.java
b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
index a220dd7..5d667ed 100644
--- a/test/org/apache/tomcat/util/net/TestIPv6Utils.java
+++ b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
@@ -111,6 +111,9 @@ public class TestIPv6Utils {
Assert.assertEquals("2001:0:0:1::1",
IPv6Utils.canonize("2001:0:0:1:0:0:0:1"));
Assert.assertEquals("2001:db8::1:0:0:1",
IPv6Utils.canonize("2001:db8:0:0:1:0:0:1"));
+// Already ends with "::"
+Assert.assertEquals("2001:db8::", IPv6Utils.canonize("2001:db8::"));
+
// IPv4 inside IPv6
Assert.assertEquals(":::192.0.2.1",
IPv6Utils.canonize(":::192.0.2.1"));
Assert.assertEquals(":::192.0.2.1",
IPv6Utils.canonize("0:0:0:0:0::192.0.2.1"));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f5016f2..6ff20e5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -80,6 +80,11 @@
comma as a separater between cookies when using the RFC 6265 cookie
processor. Based on a patch by W J Carpenter. (markt)
+
+Fix the utility code that converted IPv6 addresses to a canonical form
+to correctly handle input addresses that ended with a pair of colons.
+Based on a patch by syarramsetty-skyhook. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix canonicalization of IPv6 addresses ending in "::"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 59136a3 Fix canonicalization of IPv6 addresses ending in "::"
59136a3 is described below
commit 59136a305f5c6da40f9a87b23269fc5c73777871
Author: Mark Thomas
AuthorDate: Mon Jun 15 17:55:38 2020 +0100
Fix canonicalization of IPv6 addresses ending in "::"
Based on a patch by syarramsetty-skyhook
---
java/org/apache/tomcat/util/net/IPv6Utils.java | 2 +-
test/org/apache/tomcat/util/net/TestIPv6Utils.java | 3 +++
webapps/docs/changelog.xml | 5 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/IPv6Utils.java
b/java/org/apache/tomcat/util/net/IPv6Utils.java
index 94b8c49..bccc0a2 100644
--- a/java/org/apache/tomcat/util/net/IPv6Utils.java
+++ b/java/org/apache/tomcat/util/net/IPv6Utils.java
@@ -109,7 +109,7 @@ public class IPv6Utils {
int length = ipv6AddressLength;
int change = 0;
-if (colonsPos >= 0 && colonsPos < ipv6AddressLength - 2) {
+if (colonsPos >= 0 && colonsPos < ipv6AddressLength - 1) {
int colonCounter = 0;
for (int i = 0; i < ipv6AddressLength; i++) {
if (ipv6Address.charAt(i) == ':') {
diff --git a/test/org/apache/tomcat/util/net/TestIPv6Utils.java
b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
index a220dd7..5d667ed 100644
--- a/test/org/apache/tomcat/util/net/TestIPv6Utils.java
+++ b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
@@ -111,6 +111,9 @@ public class TestIPv6Utils {
Assert.assertEquals("2001:0:0:1::1",
IPv6Utils.canonize("2001:0:0:1:0:0:0:1"));
Assert.assertEquals("2001:db8::1:0:0:1",
IPv6Utils.canonize("2001:db8:0:0:1:0:0:1"));
+// Already ends with "::"
+Assert.assertEquals("2001:db8::", IPv6Utils.canonize("2001:db8::"));
+
// IPv4 inside IPv6
Assert.assertEquals(":::192.0.2.1",
IPv6Utils.canonize(":::192.0.2.1"));
Assert.assertEquals(":::192.0.2.1",
IPv6Utils.canonize("0:0:0:0:0::192.0.2.1"));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5d691af..ee341c2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,11 @@
comma as a separater between cookies when using the RFC 6265 cookie
processor. Based on a patch by W J Carpenter. (markt)
+
+Fix the utility code that converted IPv6 addresses to a canonical form
+to correctly handle input addresses that ended with a pair of colons.
+Based on a patch by syarramsetty-skyhook. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix canonicalization of IPv6 addresses ending in "::"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new c5f22a7 Fix canonicalization of IPv6 addresses ending in "::"
c5f22a7 is described below
commit c5f22a7da97e7cdfffef79721020fc9cc2a48ed7
Author: Mark Thomas
AuthorDate: Mon Jun 15 17:55:38 2020 +0100
Fix canonicalization of IPv6 addresses ending in "::"
Based on a patch by syarramsetty-skyhook
---
java/org/apache/tomcat/util/net/IPv6Utils.java | 2 +-
test/org/apache/tomcat/util/net/TestIPv6Utils.java | 3 +++
webapps/docs/changelog.xml | 5 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/IPv6Utils.java
b/java/org/apache/tomcat/util/net/IPv6Utils.java
index 94b8c49..bccc0a2 100644
--- a/java/org/apache/tomcat/util/net/IPv6Utils.java
+++ b/java/org/apache/tomcat/util/net/IPv6Utils.java
@@ -109,7 +109,7 @@ public class IPv6Utils {
int length = ipv6AddressLength;
int change = 0;
-if (colonsPos >= 0 && colonsPos < ipv6AddressLength - 2) {
+if (colonsPos >= 0 && colonsPos < ipv6AddressLength - 1) {
int colonCounter = 0;
for (int i = 0; i < ipv6AddressLength; i++) {
if (ipv6Address.charAt(i) == ':') {
diff --git a/test/org/apache/tomcat/util/net/TestIPv6Utils.java
b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
index a220dd7..5d667ed 100644
--- a/test/org/apache/tomcat/util/net/TestIPv6Utils.java
+++ b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
@@ -111,6 +111,9 @@ public class TestIPv6Utils {
Assert.assertEquals("2001:0:0:1::1",
IPv6Utils.canonize("2001:0:0:1:0:0:0:1"));
Assert.assertEquals("2001:db8::1:0:0:1",
IPv6Utils.canonize("2001:db8:0:0:1:0:0:1"));
+// Already ends with "::"
+Assert.assertEquals("2001:db8::", IPv6Utils.canonize("2001:db8::"));
+
// IPv4 inside IPv6
Assert.assertEquals(":::192.0.2.1",
IPv6Utils.canonize(":::192.0.2.1"));
Assert.assertEquals(":::192.0.2.1",
IPv6Utils.canonize("0:0:0:0:0::192.0.2.1"));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fed8f8e..f1f1010 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -80,6 +80,11 @@
comma as a separater between cookies when using the RFC 6265 cookie
processor. Based on a patch by W J Carpenter. (markt)
+
+Fix the utility code that converted IPv6 addresses to a canonical form
+to correctly handle input addresses that ended with a pair of colons.
+Based on a patch by syarramsetty-skyhook. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Rename so tests run as part of normal test runs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 53a0ef5 Rename so tests run as part of normal test runs
53a0ef5 is described below
commit 53a0ef53a63b018673f898c8eb058b5b075b3372
Author: Mark Thomas
AuthorDate: Mon Jun 15 17:38:17 2020 +0100
Rename so tests run as part of normal test runs
---
.../apache/tomcat/util/net/{IPv6UtilsTest.java => TestIPv6Utils.java} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/IPv6UtilsTest.java
b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
similarity index 99%
rename from test/org/apache/tomcat/util/net/IPv6UtilsTest.java
rename to test/org/apache/tomcat/util/net/TestIPv6Utils.java
index 11dc4ae..a220dd7 100644
--- a/test/org/apache/tomcat/util/net/IPv6UtilsTest.java
+++ b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
@@ -23,7 +23,7 @@ import org.junit.Test;
/**
* Mostly examples from RFC 5952
*/
-public class IPv6UtilsTest {
+public class TestIPv6Utils {
@Test
public void testMayBeIPv6Address() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Rename so tests run as part of normal test runs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 042101d Rename so tests run as part of normal test runs
042101d is described below
commit 042101db9a4a243bb5111b8fce0c35e36aa255f4
Author: Mark Thomas
AuthorDate: Mon Jun 15 17:38:17 2020 +0100
Rename so tests run as part of normal test runs
---
.../apache/tomcat/util/net/{IPv6UtilsTest.java => TestIPv6Utils.java} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/IPv6UtilsTest.java
b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
similarity index 99%
rename from test/org/apache/tomcat/util/net/IPv6UtilsTest.java
rename to test/org/apache/tomcat/util/net/TestIPv6Utils.java
index 11dc4ae..a220dd7 100644
--- a/test/org/apache/tomcat/util/net/IPv6UtilsTest.java
+++ b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
@@ -23,7 +23,7 @@ import org.junit.Test;
/**
* Mostly examples from RFC 5952
*/
-public class IPv6UtilsTest {
+public class TestIPv6Utils {
@Test
public void testMayBeIPv6Address() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Rename so tests run as part of normal test runs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new b199a17 Rename so tests run as part of normal test runs
b199a17 is described below
commit b199a174e2cf5367a7efbb83ae008c88adb3a978
Author: Mark Thomas
AuthorDate: Mon Jun 15 17:38:17 2020 +0100
Rename so tests run as part of normal test runs
---
.../apache/tomcat/util/net/{IPv6UtilsTest.java => TestIPv6Utils.java} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/IPv6UtilsTest.java
b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
similarity index 99%
rename from test/org/apache/tomcat/util/net/IPv6UtilsTest.java
rename to test/org/apache/tomcat/util/net/TestIPv6Utils.java
index 11dc4ae..a220dd7 100644
--- a/test/org/apache/tomcat/util/net/IPv6UtilsTest.java
+++ b/test/org/apache/tomcat/util/net/TestIPv6Utils.java
@@ -23,7 +23,7 @@ import org.junit.Test;
/**
* Mostly examples from RFC 5952
*/
-public class IPv6UtilsTest {
+public class TestIPv6Utils {
@Test
public void testMayBeIPv6Address() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #289: Add mimetype for WASM files
markt-asf closed pull request #289: URL: https://github.com/apache/tomcat/pull/289 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #289: Add mimetype for WASM files
markt-asf commented on pull request #289: URL: https://github.com/apache/tomcat/pull/289#issuecomment-644233696 Thanks for the PR. I patched this by hand as there are a couple of other files that also need to be updated. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (ca880df -> 2e692c7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ca880df Fix BZ64501 - Avoid feature not available by default on Solaris 10 new 1841cf1 Remove unnecessary entry now Tomcat checks extensions case insensitively new 2e692c7 Add support for application/wasm media type The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 2 +- webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add support for application/wasm media type
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 2e692c7abf041e1784390aef5f7f89f1d9563b95 Author: Mark Thomas AuthorDate: Mon Jun 15 17:15:36 2020 +0100 Add support for application/wasm media type --- conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 1 + webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index aa62dde..dccac75 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -4232,6 +4232,10 @@ application/x-doom +wasm +application/wasm + + wav audio/x-wav diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index a043c5b..84a7e33 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -910,6 +910,7 @@ vtu=model/vnd.vtu vxml=application/voicexml+xml w3d=application/x-director wad=application/x-doom +wasm=application/wasm wav=audio/x-wav wax=audio/x-ms-wax wbmp=image/vnd.wap.wbmp diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 8441f31..a589022 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,6 +94,7 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic +wasm application/wasm z application/x-compress ); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5afb202..bcba434 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -66,6 +66,10 @@ 64470: The default value of the solidus handling should reflect the associated system property. (remm) + +Add application/wasm to the media types recognised by +Tomcat. Based on a PR by Thiago Henrique Hüpner. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Remove unnecessary entry now Tomcat checks extensions case insensitively
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 1841cf1e9f31dd7a9ce8107edf858bdaabe35fb2 Author: Mark Thomas AuthorDate: Mon Jun 15 17:02:28 2020 +0100 Remove unnecessary entry now Tomcat checks extensions case insensitively --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 344f801..8441f31 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -95,7 +95,6 @@ my %TOMCAT_ONLY = qw( shtml text/x-server-parsed-html ulw audio/basic z application/x-compress -Z application/x-compress ); # Mime types, that are defined differently - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Remove unnecessary entry now Tomcat checks extensions case insensitively
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b26b732989db203ee61ad3a18ed3968b465bbc7a Author: Mark Thomas AuthorDate: Mon Jun 15 17:02:28 2020 +0100 Remove unnecessary entry now Tomcat checks extensions case insensitively --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 344f801..8441f31 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -95,7 +95,6 @@ my %TOMCAT_ONLY = qw( shtml text/x-server-parsed-html ulw audio/basic z application/x-compress -Z application/x-compress ); # Mime types, that are defined differently - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (5b794bb -> 908b6ea)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 5b794bb Add and use constants new b26b732 Remove unnecessary entry now Tomcat checks extensions case insensitively new 908b6ea Add support for application/wasm media type The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 2 +- webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add support for application/wasm media type
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 908b6ea4f41053005e3c1c7fc3e1f5ad9719 Author: Mark Thomas AuthorDate: Mon Jun 15 17:15:36 2020 +0100 Add support for application/wasm media type --- conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 1 + webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index e8a5154..cf873f6 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -4247,6 +4247,10 @@ application/x-doom +wasm +application/wasm + + wav audio/x-wav diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index a043c5b..84a7e33 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -910,6 +910,7 @@ vtu=model/vnd.vtu vxml=application/voicexml+xml w3d=application/x-director wad=application/x-doom +wasm=application/wasm wav=audio/x-wav wax=audio/x-ms-wax wbmp=image/vnd.wap.wbmp diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 8441f31..a589022 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,6 +94,7 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic +wasm application/wasm z application/x-compress ); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 62d777e..f5016f2 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -62,6 +62,10 @@ cache implementation that could lead to NullPointerExceptions during class loading. (markt) + +Add application/wasm to the media types recognised by +Tomcat. Based on a PR by Thiago Henrique Hüpner. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (b2ceefd -> 3150d7e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b2ceefd Update to OWB 2.0.17 new 86fbb60 Remove unnecessary entry now Tomcat checks extensions case insensitively new 3150d7e Add support for application/wasm media type The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 2 +- webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Remove unnecessary entry now Tomcat checks extensions case insensitively
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 86fbb60cafaf32cdadad0e1b06336f975d0184fe Author: Mark Thomas AuthorDate: Mon Jun 15 17:02:28 2020 +0100 Remove unnecessary entry now Tomcat checks extensions case insensitively --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 344f801..8441f31 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -95,7 +95,6 @@ my %TOMCAT_ONLY = qw( shtml text/x-server-parsed-html ulw audio/basic z application/x-compress -Z application/x-compress ); # Mime types, that are defined differently - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add support for application/wasm media type
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 3150d7eb472bfd4aa0d15aeabe81e9cf2d5b17e3 Author: Mark Thomas AuthorDate: Mon Jun 15 17:15:36 2020 +0100 Add support for application/wasm media type --- conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 1 + webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index 99d517d..bd17e85 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -4253,6 +4253,10 @@ application/x-doom +wasm +application/wasm + + wav audio/x-wav diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index a043c5b..84a7e33 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -910,6 +910,7 @@ vtu=model/vnd.vtu vxml=application/voicexml+xml w3d=application/x-director wad=application/x-doom +wasm=application/wasm wav=audio/x-wav wax=audio/x-ms-wax wbmp=image/vnd.wap.wbmp diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 8441f31..a589022 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,6 +94,7 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic +wasm application/wasm z application/x-compress ); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 316b7b7..fed8f8e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -62,6 +62,10 @@ cache implementation that could lead to NullPointerExceptions during class loading. (markt) + +Add application/wasm to the media types recognised by +Tomcat. Based on a PR by Thiago Henrique Hüpner. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add support for application/wasm media type
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 54898ee4c0974fc3280abcb753e54d76d2149d2c Author: Mark Thomas AuthorDate: Mon Jun 15 17:15:36 2020 +0100 Add support for application/wasm media type --- conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 1 + webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index a0f604a..ef80563 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -4258,6 +4258,10 @@ application/x-doom +wasm +application/wasm + + wav audio/x-wav diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index a043c5b..84a7e33 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -910,6 +910,7 @@ vtu=model/vnd.vtu vxml=application/voicexml+xml w3d=application/x-director wad=application/x-doom +wasm=application/wasm wav=audio/x-wav wax=audio/x-ms-wax wbmp=image/vnd.wap.wbmp diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 8441f31..a589022 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,6 +94,7 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic +wasm application/wasm z application/x-compress ); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d37b070..5d691af 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -65,6 +65,10 @@ cache implementation that could lead to NullPointerExceptions during class loading. (markt) + +Add application/wasm to the media types recognised by +Tomcat. Based on a PR by Thiago Henrique Hüpner. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Remove unnecessary entry now Tomcat checks extensions case insensitively
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ba4bcfbda79bc655b4283e160981f9f4d026f181 Author: Mark Thomas AuthorDate: Mon Jun 15 17:02:28 2020 +0100 Remove unnecessary entry now Tomcat checks extensions case insensitively --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index 344f801..8441f31 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -95,7 +95,6 @@ my %TOMCAT_ONLY = qw( shtml text/x-server-parsed-html ulw audio/basic z application/x-compress -Z application/x-compress ); # Mime types, that are defined differently - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (9c84478 -> 54898ee)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 9c84478 3.0 is a valid version for JSP documents in JSP 3.0 onwards new ba4bcfb Remove unnecessary entry now Tomcat checks extensions case insensitively new 54898ee Add support for application/wasm media type The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conf/web.xml | 4 java/org/apache/catalina/startup/MimeTypeMappings.properties | 1 + res/scripts/check-mime.pl| 2 +- webapps/docs/changelog.xml | 4 4 files changed, 10 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat running fully on JPMS
And just now got it running fully on OSGi (with a small bootup shim, a.k.a. bundle). - Ray On Mon, Jun 15, 2020 at 9:58 AM Raymond Auge wrote: > There's a slew of changes still needed, but at least it's not a > pie-in-the-sky-like effort. > > - Ray > > On Mon, Jun 15, 2020 at 9:33 AM Mark Thomas wrote: > >> On 15/06/2020 01:56, Raymond Auge wrote: >> > Hey all, >> > >> > I couldn't resist but to let you know that today I run tomcat 10 fully >> > on JPMS (and the webapp examples seemed to all work fine): >> >> Nice. >> >> I was expecting it to be rather more disruptive than it turned out to >> be. Thanks for sharing your JPMS/OSGI expertise. >> >> Mark >> >> >> > >> > bin]$ /usr/lib/jvm/zulu-11-amd64/bin/java \ >> >> -Djava.protocol.handler.pkgs=org.apache.catalina.webresources \ >> >> -p .:../lib/ \ >> >> --add-modules org.apache.tomcat.jasper \ >> >> --module >> org.apache.tomcat.catalina/org.apache.catalina.startup.Bootstrap start >> > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina >> > addClusterRuleSet >> > INFO: Cluster RuleSet not found due to >> > [java.lang.ClassNotFoundException: >> > org.apache.catalina.ha.ClusterRuleSet]. Cluster configuration disabled. >> > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina >> > addClusterRuleSet >> > INFO: Cluster RuleSet not found due to >> > [java.lang.ClassNotFoundException: >> > org.apache.catalina.ha.ClusterRuleSet]. Cluster configuration disabled. >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Server version name: Apache Tomcat/10.0.0-M7-dev >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Server built: Jun 14 2020 13:51:24 UTC >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Server version number: 10.0.0.0 >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: OS Name: Linux >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: OS Version:5.3.0-59-generic >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Architecture: amd64 >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Java Home: /usr/lib/jvm/zulu-11-amd64 >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: JVM Version: 11.0.7+10-LTS >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: JVM Vendor:Azul Systems, Inc. >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: CATALINA_BASE: /home/rotty/projects/tomcat/output/build >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: CATALINA_HOME: /home/rotty/projects/tomcat/output/build >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Command line argument: >> > -Djava.protocol.handler.pkgs=org.apache.catalina.webresources >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Command line argument: --module-path=.:../lib/ >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Command line argument: --add-modules=org.apache.tomcat.jasper >> > Jun. 14, 2020 8:51:30 P.M. >> > org.apache.catalina.startup.VersionLoggerListener log >> > INFO: Command line argument: >> -Djdk.module.main=org.apache.tomcat.catalina >> > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.AprLifecycleListener >> > lifecycleEvent >> > INFO: The Apache Tomcat Native library which allows using OpenSSL was >> > not found on the java.library.path: >> > [/usr/java/packages/lib:/usr/lib64:/lib64:/lib:/usr/lib] >> > Jun. 14, 2020 8:51:30 P.M. org.apache.coyote.AbstractProtocol init >> > INFO: Initializing ProtocolHandler ["http-nio-8080"] >> > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina load >> > INFO: Server initialization in [449] milliseconds >> > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.StandardService >> > startInternal >> > INFO: Starting service [Catalina] >> > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.StandardEngine >> > startInternal >> > INFO: Starting Servlet engine: [Apache Tomcat/10.0.0-M7-dev] >> > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.startup.HostConfig >> > deployDirectory >> > INFO: Deploying web application directory >> > [/home/rotty/projects/tomcat/output/build/webapps/ROOT] >> > Jun. 14, 2020 8:51:31 P.M. >> > org.apache.tomcat.util.descriptor.DigesterFactory locationFor >> > WARNING: The XML schema [web-fragment_5_0.xsd] could not be found. This >> > is very likely to break XML validation if XML valid
[tomcat] 01/02: Fix indent
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ef0bb84e0ffd2e5153bbfd3b6f48d3e8d619fe1e
Author: Mark Thomas
AuthorDate: Thu Jun 11 22:24:55 2020 +0100
Fix indent
---
test/org/apache/jasper/compiler/TestJspDocumentParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
index a38ae6a..0bfd702 100644
--- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
+++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
@@ -89,7 +89,7 @@ public class TestJspDocumentParser extends TomcatBaseTest {
rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5/bug54821b.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
- }
+}
@Test
public void testSchemaValidation() throws Exception {
@@ -120,5 +120,5 @@ public class TestJspDocumentParser extends TomcatBaseTest {
Document document = db.parse(path);
Assert.assertEquals("urn:valid",
document.getDocumentElement().getNamespaceURI());
Assert.assertEquals("root",
document.getDocumentElement().getLocalName());
- }
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (eeafcd7 -> 9c84478)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from eeafcd7 Update to OWB 2.0.17 new ef0bb84 Fix indent new 9c84478 3.0 is a valid version for JSP documents in JSP 3.0 onwards The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/jasper/compiler/Validator.java | 2 +- .../jasper/resources/LocalStrings.properties | 2 +- .../jasper/resources/LocalStrings_es.properties| 2 +- .../jasper/resources/LocalStrings_fr.properties| 2 +- .../jasper/resources/LocalStrings_ja.properties| 2 +- .../jasper/resources/LocalStrings_ko.properties| 2 +- .../jasper/resources/LocalStrings_zh_CN.properties | 2 +- .../jasper/compiler/TestJspDocumentParser.java | 96 +- .../jsp/doc-version-invalid/document-0.4.jspx | 9 +- .../jsp/doc-version-invalid/document-1.1.jspx | 9 +- .../jsp/doc-version-invalid/document-1.2.1.jspx| 9 +- .../jsp/doc-version-invalid/document-1.3.jspx | 9 +- .../jsp/doc-version-invalid/document-1.9.jspx | 9 +- .../jsp/doc-version-invalid/document-2.4.jspx | 9 +- .../jsp/doc-version-invalid/document-3.1.jspx | 9 +- .../jsp/doc-version-invalid/document-5.4.jspx | 9 +- .../webapp/jsp/doc-version-valid/document-1.2.jspx | 9 +- .../webapp/jsp/doc-version-valid/document-2.0.jspx | 9 +- .../webapp/jsp/doc-version-valid/document-2.1.jspx | 9 +- .../webapp/jsp/doc-version-valid/document-2.2.jspx | 9 +- .../webapp/jsp/doc-version-valid/document-2.3.jspx | 9 +- .../webapp/jsp/doc-version-valid/document-3.0.jspx | 9 +- webapps/docs/changelog.xml | 8 ++ 23 files changed, 221 insertions(+), 23 deletions(-) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-0.4.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-1.1.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-1.2.1.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-1.3.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-1.9.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-2.4.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-3.1.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-invalid/document-5.4.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-valid/document-1.2.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-valid/document-2.0.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-valid/document-2.1.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-valid/document-2.2.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-valid/document-2.3.jspx (85%) copy webapps/docs/META-INF/context.xml => test/webapp/jsp/doc-version-valid/document-3.0.jspx (85%) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: 3.0 is a valid version for JSP documents in JSP 3.0 onwards
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9c844788072c67d1f095f632ffd719654d4de21d
Author: Mark Thomas
AuthorDate: Mon Jun 15 15:27:45 2020 +0100
3.0 is a valid version for JSP documents in JSP 3.0 onwards
---
java/org/apache/jasper/compiler/Validator.java | 2 +-
.../jasper/resources/LocalStrings.properties | 2 +-
.../jasper/resources/LocalStrings_es.properties| 2 +-
.../jasper/resources/LocalStrings_fr.properties| 2 +-
.../jasper/resources/LocalStrings_ja.properties| 2 +-
.../jasper/resources/LocalStrings_ko.properties| 2 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 2 +-
.../jasper/compiler/TestJspDocumentParser.java | 92 ++
.../jsp/doc-version-invalid/document-0.4.jspx | 25 ++
.../jsp/doc-version-invalid/document-1.1.jspx | 25 ++
.../jsp/doc-version-invalid/document-1.2.1.jspx| 25 ++
.../jsp/doc-version-invalid/document-1.3.jspx | 25 ++
.../jsp/doc-version-invalid/document-1.9.jspx | 25 ++
.../jsp/doc-version-invalid/document-2.4.jspx | 25 ++
.../jsp/doc-version-invalid/document-3.1.jspx | 25 ++
.../jsp/doc-version-invalid/document-5.4.jspx | 25 ++
.../webapp/jsp/doc-version-valid/document-1.2.jspx | 25 ++
.../webapp/jsp/doc-version-valid/document-2.0.jspx | 25 ++
.../webapp/jsp/doc-version-valid/document-2.1.jspx | 25 ++
.../webapp/jsp/doc-version-valid/document-2.2.jspx | 25 ++
.../webapp/jsp/doc-version-valid/document-2.3.jspx | 25 ++
.../webapp/jsp/doc-version-valid/document-3.0.jspx | 25 ++
webapps/docs/changelog.xml | 8 ++
23 files changed, 457 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Validator.java
b/java/org/apache/jasper/compiler/Validator.java
index 0e30afe..289dc94 100644
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -533,7 +533,7 @@ class Validator {
String version = n.getTextAttribute("version");
if (!version.equals("1.2") && !version.equals("2.0") &&
!version.equals("2.1") && !version.equals("2.2") &&
-!version.equals("2.3")) {
+!version.equals("2.3") && !version.equals("3.0")) {
err.jspError(n, "jsp.error.jsproot.version.invalid", version);
}
visitBody(n);
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index d2f303c..3261dcb 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -107,7 +107,7 @@ jsp.error.jspoutput.doctypenamesystem=:
'doctype-root-element'
jsp.error.jspoutput.doctypepublicsystem=: 'doctype-system'
attribute must appear if 'doctype-public' attribute appears
jsp.error.jspoutput.invalidUse= must not be used in standard
syntax
jsp.error.jspoutput.nonemptybody= must not have a body
-jsp.error.jsproot.version.invalid=Invalid version number: [{0}], must be
"1.2", "2.0", "2.1", "2.2" or "2.3"
+jsp.error.jsproot.version.invalid=Invalid version number: [{0}], must be
"1.2", "2.0", "2.1", "2.2", "2.3" or "3.0"
jsp.error.jsptext.badcontent='<', when appears in the body of
, must be encapsulated within a CDATA
jsp.error.lastModified=Unable to determine last modified date for file [{0}]
jsp.error.library.invalid=JSP page is invalid according to library [{0}]: [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index e5eb63e..1ee32f3 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -99,7 +99,7 @@ jsp.error.jspoutput.doctypenamesystem=:
atributos 'doctype-roo
jsp.error.jspoutput.doctypepublicsystem=: atributo
'doctype-system' debe de aparecer si aparece atributo 'doctype-public'
jsp.error.jspoutput.invalidUse= no se debe de usar en
sintáxis estándar
jsp.error.jspoutput.nonemptybody= no debe de tener un cuerpo
-jsp.error.jsproot.version.invalid=Número incorrecto de versión: [{0}], debe de
ser "1.2" o "2.0" o "2.1" o "2.2" o "2.3"
+jsp.error.jsproot.version.invalid=Número incorrecto de versión: [{0}], debe de
ser "1.2" o "2.0" o "2.1" o "2.2" o "2.3" o "3.0"
jsp.error.jsptext.badcontent='<', cuando aparece en el cuerpo de
, debe de estar encapsulado dentro de un CDATA
jsp.error.lastModified=No puedo determinar la última fecha de modificación
para el fichero [{0}]
jsp.error.library.invalid=La página JSP es incorrecta de acuerdo a la
bibliot
Re: Tomcat running fully on JPMS
There's a slew of changes still needed, but at least it's not a pie-in-the-sky-like effort. - Ray On Mon, Jun 15, 2020 at 9:33 AM Mark Thomas wrote: > On 15/06/2020 01:56, Raymond Auge wrote: > > Hey all, > > > > I couldn't resist but to let you know that today I run tomcat 10 fully > > on JPMS (and the webapp examples seemed to all work fine): > > Nice. > > I was expecting it to be rather more disruptive than it turned out to > be. Thanks for sharing your JPMS/OSGI expertise. > > Mark > > > > > > bin]$ /usr/lib/jvm/zulu-11-amd64/bin/java \ > >> -Djava.protocol.handler.pkgs=org.apache.catalina.webresources \ > >> -p .:../lib/ \ > >> --add-modules org.apache.tomcat.jasper \ > >> --module > org.apache.tomcat.catalina/org.apache.catalina.startup.Bootstrap start > > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina > > addClusterRuleSet > > INFO: Cluster RuleSet not found due to > > [java.lang.ClassNotFoundException: > > org.apache.catalina.ha.ClusterRuleSet]. Cluster configuration disabled. > > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina > > addClusterRuleSet > > INFO: Cluster RuleSet not found due to > > [java.lang.ClassNotFoundException: > > org.apache.catalina.ha.ClusterRuleSet]. Cluster configuration disabled. > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Server version name: Apache Tomcat/10.0.0-M7-dev > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Server built: Jun 14 2020 13:51:24 UTC > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Server version number: 10.0.0.0 > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: OS Name: Linux > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: OS Version:5.3.0-59-generic > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Architecture: amd64 > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Java Home: /usr/lib/jvm/zulu-11-amd64 > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: JVM Version: 11.0.7+10-LTS > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: JVM Vendor:Azul Systems, Inc. > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: CATALINA_BASE: /home/rotty/projects/tomcat/output/build > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: CATALINA_HOME: /home/rotty/projects/tomcat/output/build > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Command line argument: > > -Djava.protocol.handler.pkgs=org.apache.catalina.webresources > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Command line argument: --module-path=.:../lib/ > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Command line argument: --add-modules=org.apache.tomcat.jasper > > Jun. 14, 2020 8:51:30 P.M. > > org.apache.catalina.startup.VersionLoggerListener log > > INFO: Command line argument: -Djdk.module.main=org.apache.tomcat.catalina > > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.AprLifecycleListener > > lifecycleEvent > > INFO: The Apache Tomcat Native library which allows using OpenSSL was > > not found on the java.library.path: > > [/usr/java/packages/lib:/usr/lib64:/lib64:/lib:/usr/lib] > > Jun. 14, 2020 8:51:30 P.M. org.apache.coyote.AbstractProtocol init > > INFO: Initializing ProtocolHandler ["http-nio-8080"] > > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina load > > INFO: Server initialization in [449] milliseconds > > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.StandardService > > startInternal > > INFO: Starting service [Catalina] > > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.StandardEngine > > startInternal > > INFO: Starting Servlet engine: [Apache Tomcat/10.0.0-M7-dev] > > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.startup.HostConfig > > deployDirectory > > INFO: Deploying web application directory > > [/home/rotty/projects/tomcat/output/build/webapps/ROOT] > > Jun. 14, 2020 8:51:31 P.M. > > org.apache.tomcat.util.descriptor.DigesterFactory locationFor > > WARNING: The XML schema [web-fragment_5_0.xsd] could not be found. This > > is very likely to break XML validation if XML validation is enabled. > > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.startup.HostConfig > > deployDirectory > > INFO: Deployment of web application directory > > [/home/rotty/projects/tomcat/output/build/webapps/ROOT] has finished in > > [184] ms > > Jun. 14, 2
Re: Tomcat running fully on JPMS
On 15/06/2020 01:56, Raymond Auge wrote: > Hey all, > > I couldn't resist but to let you know that today I run tomcat 10 fully > on JPMS (and the webapp examples seemed to all work fine): Nice. I was expecting it to be rather more disruptive than it turned out to be. Thanks for sharing your JPMS/OSGI expertise. Mark > > bin]$ /usr/lib/jvm/zulu-11-amd64/bin/java \ >> -Djava.protocol.handler.pkgs=org.apache.catalina.webresources \ >> -p .:../lib/ \ >> --add-modules org.apache.tomcat.jasper \ >> --module org.apache.tomcat.catalina/org.apache.catalina.startup.Bootstrap >> start > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina > addClusterRuleSet > INFO: Cluster RuleSet not found due to > [java.lang.ClassNotFoundException: > org.apache.catalina.ha.ClusterRuleSet]. Cluster configuration disabled. > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina > addClusterRuleSet > INFO: Cluster RuleSet not found due to > [java.lang.ClassNotFoundException: > org.apache.catalina.ha.ClusterRuleSet]. Cluster configuration disabled. > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Server version name: Apache Tomcat/10.0.0-M7-dev > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Server built: Jun 14 2020 13:51:24 UTC > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Server version number: 10.0.0.0 > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: OS Name: Linux > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: OS Version: 5.3.0-59-generic > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Architecture: amd64 > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Java Home: /usr/lib/jvm/zulu-11-amd64 > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: JVM Version: 11.0.7+10-LTS > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: JVM Vendor: Azul Systems, Inc. > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: CATALINA_BASE: /home/rotty/projects/tomcat/output/build > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: CATALINA_HOME: /home/rotty/projects/tomcat/output/build > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Command line argument: > -Djava.protocol.handler.pkgs=org.apache.catalina.webresources > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Command line argument: --module-path=.:../lib/ > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Command line argument: --add-modules=org.apache.tomcat.jasper > Jun. 14, 2020 8:51:30 P.M. > org.apache.catalina.startup.VersionLoggerListener log > INFO: Command line argument: -Djdk.module.main=org.apache.tomcat.catalina > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.AprLifecycleListener > lifecycleEvent > INFO: The Apache Tomcat Native library which allows using OpenSSL was > not found on the java.library.path: > [/usr/java/packages/lib:/usr/lib64:/lib64:/lib:/usr/lib] > Jun. 14, 2020 8:51:30 P.M. org.apache.coyote.AbstractProtocol init > INFO: Initializing ProtocolHandler ["http-nio-8080"] > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.startup.Catalina load > INFO: Server initialization in [449] milliseconds > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.StandardService > startInternal > INFO: Starting service [Catalina] > Jun. 14, 2020 8:51:30 P.M. org.apache.catalina.core.StandardEngine > startInternal > INFO: Starting Servlet engine: [Apache Tomcat/10.0.0-M7-dev] > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.startup.HostConfig > deployDirectory > INFO: Deploying web application directory > [/home/rotty/projects/tomcat/output/build/webapps/ROOT] > Jun. 14, 2020 8:51:31 P.M. > org.apache.tomcat.util.descriptor.DigesterFactory locationFor > WARNING: The XML schema [web-fragment_5_0.xsd] could not be found. This > is very likely to break XML validation if XML validation is enabled. > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.startup.HostConfig > deployDirectory > INFO: Deployment of web application directory > [/home/rotty/projects/tomcat/output/build/webapps/ROOT] has finished in > [184] ms > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.startup.HostConfig > deployDirectory > INFO: Deploying web application directory > [/home/rotty/projects/tomcat/output/build/webapps/examples] > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.core.ApplicationContext log > INFO: ContextListener: contextInitialized() > Jun. 14, 2020 8:51:31 P.M. org.apache.catalina.co
[tomcat] branch 9.0.x updated: Update to OWB 2.0.17
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b2ceefd Update to OWB 2.0.17
b2ceefd is described below
commit b2ceefd9f2676081051a6112ab388ee613dd53d0
Author: remm
AuthorDate: Mon Jun 15 15:18:58 2020 +0200
Update to OWB 2.0.17
Use the new shade plugin version, it seems to work properly now. Simply
some items ... But add new stuff due to new warnings.
---
modules/owb/pom.xml| 31 ---
webapps/docs/changelog.xml | 3 +++
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index ee2869a..7fe93e5 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
Apache Tomcat CDI 2 support
Apache Tomcat CDI 2 support using Apache
OpenWebBeans
-2.0.16
+2.0.17
jar
1.0
1.0
1.0.1
-9.0.33
+9.0.36
@@ -80,7 +80,6 @@
-
@@ -95,7 +94,7 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.1
+3.2.4
package
@@ -105,21 +104,23 @@
false
-
-
-${mainClass}
-
+
+
+
+
+
+
+*:*
+
+
META-INF/DEPENDENCIES
+META-INF/MANIFEST.MF
+
+
+
-
-
-org.apache.openwebbeans
-openwebbeans-maven
-${project.version}
-
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 888f540..316b7b7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -97,6 +97,9 @@
64515: Bnd files don't need to be filtered (save some work).
Pull request provided by Raymond Augé. (markt)
+
+Update the OWB module to Apache OpenWebBeans 2.0.17. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update to OWB 2.0.17
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new eeafcd7 Update to OWB 2.0.17
eeafcd7 is described below
commit eeafcd76feaae0558e0e6c60ac4d9ad00b3d221b
Author: remm
AuthorDate: Mon Jun 15 15:18:58 2020 +0200
Update to OWB 2.0.17
Use the new shade plugin version, it seems to work properly now. Simply
some items ... But add new stuff due to new warnings.
---
modules/owb/pom.xml| 34 --
webapps/docs/changelog.xml | 3 +++
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 1a58c67..2fd627b 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
Apache Tomcat CDI 2 support
Apache Tomcat CDI 2 support using Apache
OpenWebBeans
-2.0.16
+2.0.17
jar
1.0
1.0
1.0.1
-10.0.0-M3
+10.0.0-M6
@@ -80,7 +80,6 @@
-
@@ -95,8 +94,7 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.1
-
+3.2.4
package
@@ -106,23 +104,23 @@
false
-
-
-
-${mainClass}
-
+
+
+
+
+
+
+*:*
+
+
META-INF/DEPENDENCIES
+META-INF/MANIFEST.MF
+
+
+
-
-
-
-org.apache.openwebbeans
-openwebbeans-maven
-${project.version}
-
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61c628c..de814bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,9 @@
64515: Bnd files don't need to be filtered (save some work).
Pull request provided by Raymond Augé. (markt)
+
+Update the OWB module to Apache OpenWebBeans 2.0.17. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
