[tomcat] branch 8.5.x updated: Catch NamingException instead of specialized sub-classes

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 4b140ee40f Catch NamingException instead of specialized sub-classes
4b140ee40f is described below

commit 4b140ee40f58373de28bf90eabec90fdcf53ef40
Author: Felix Schumacher 
AuthorDate: Thu Jul 20 11:14:19 2023 +0200

Catch NamingException instead of specialized sub-classes

In Java 8 and up to 17 a closed connection is signaled with
a NamingException and not a CommunicationException ora
ServiceUnavailableException.  Such a condition should lead
to re-opening the LDAP connection.

In Java 18 it is fixed by https://bugs.openjdk.org/browse/JDK-8273402
---
 java/org/apache/catalina/realm/JNDIRealm.java | 10 +++---
 webapps/docs/changelog.xml|  4 
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 1f9690ab78..c55f075779 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -37,7 +37,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import javax.naming.AuthenticationException;
-import javax.naming.CommunicationException;
 import javax.naming.CompositeName;
 import javax.naming.Context;
 import javax.naming.InvalidNameException;
@@ -47,7 +46,6 @@ import javax.naming.NameParser;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.PartialResultException;
-import javax.naming.ServiceUnavailableException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -2372,7 +2370,13 @@ public class JNDIRealm extends RealmBase {
 // Authenticate the specified username if possible
 principal = getPrincipal(connection, username, gssCredential);
 
-} catch (CommunicationException | ServiceUnavailableException e) {
+} catch (NamingException e) {
+/* While we would like to catch specialized exceptions like
+ * CommunicationException and ServiceUnavailableException,
+ * some network communication problems are reported as
+ * this general exception. This is fixed in Java 18 by
+ * https://bugs.openjdk.org/browse/JDK-8273402
+ */
 // log the exception so we know it's there.
 containerLog.info(sm.getString("jndiRealm.exception.retry"), 
e);
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0d5be9f071..f5cea73c49 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,10 @@
 presistence process, do not log a warning that null Principals are not
 serializable. Pull request 638 provided by tsryo. (markt)
   
+  
+Catch NamingException in 
JNDIRealm#getPrincipal.
+It is used in Java up to 17 to signal closed connections. (fschumacher)
+  
 
   
   


-
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: Catch NamingException instead of specialized sub-classes

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 7e2cd05cee Catch NamingException instead of specialized sub-classes
7e2cd05cee is described below

commit 7e2cd05cee8de346c3096437b5dda8da361dd47f
Author: Felix Schumacher 
AuthorDate: Thu Jul 20 11:14:19 2023 +0200

Catch NamingException instead of specialized sub-classes

In Java 8 and up to 17 a closed connection is signaled with
a NamingException and not a CommunicationException ora
ServiceUnavailableException.  Such a condition should lead
to re-opening the LDAP connection.

In Java 18 it is fixed by https://bugs.openjdk.org/browse/JDK-8273402
---
 java/org/apache/catalina/realm/JNDIRealm.java | 10 +++---
 webapps/docs/changelog.xml|  4 
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 619a704c99..a68f1a0db1 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -37,7 +37,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import javax.naming.AuthenticationException;
-import javax.naming.CommunicationException;
 import javax.naming.CompositeName;
 import javax.naming.Context;
 import javax.naming.InvalidNameException;
@@ -47,7 +46,6 @@ import javax.naming.NameParser;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.PartialResultException;
-import javax.naming.ServiceUnavailableException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -2356,7 +2354,13 @@ public class JNDIRealm extends RealmBase {
 // Authenticate the specified username if possible
 principal = getPrincipal(connection, username, gssCredential);
 
-} catch (CommunicationException | ServiceUnavailableException e) {
+} catch (NamingException e) {
+/* While we would like to catch specialized exceptions like
+ * CommunicationException and ServiceUnavailableException,
+ * some network communication problems are reported as
+ * this general exception. This is fixed in Java 18 by
+ * https://bugs.openjdk.org/browse/JDK-8273402
+ */
 // log the exception so we know it's there.
 containerLog.info(sm.getString("jndiRealm.exception.retry"), 
e);
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f8b8f3f95e..b567b43f56 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
 presistence process, do not log a warning that null Principals are not
 serializable. Pull request 638 provided by tsryo. (markt)
   
+  
+Catch NamingException in 
JNDIRealm#getPrincipal.
+It is used in Java up to 17 to signal closed connections. (fschumacher)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 10.1.x updated: Catch NamingException instead of specialized sub-classes

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 2a80e8e117 Catch NamingException instead of specialized sub-classes
 new 46e93b4ec6 Merge pull request #640 from 
FSchumacher/catch-naming-exception-in-getprincipal
2a80e8e117 is described below

commit 2a80e8e117cf178aac23ce4deff04a49429ae1bd
Author: Felix Schumacher 
AuthorDate: Thu Jul 20 11:14:19 2023 +0200

Catch NamingException instead of specialized sub-classes

In Java 8 and up to 17 a closed connection is signaled with
a NamingException and not a CommunicationException ora
ServiceUnavailableException.  Such a condition should lead
to re-opening the LDAP connection.

In Java 18 it is fixed by https://bugs.openjdk.org/browse/JDK-8273402
---
 java/org/apache/catalina/realm/JNDIRealm.java | 10 +++---
 webapps/docs/changelog.xml|  4 
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 947eb1517f..f772c5acf6 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -37,7 +37,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import javax.naming.AuthenticationException;
-import javax.naming.CommunicationException;
 import javax.naming.CompositeName;
 import javax.naming.Context;
 import javax.naming.InvalidNameException;
@@ -47,7 +46,6 @@ import javax.naming.NameParser;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.PartialResultException;
-import javax.naming.ServiceUnavailableException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -2355,7 +2353,13 @@ public class JNDIRealm extends RealmBase {
 // Authenticate the specified username if possible
 principal = getPrincipal(connection, username, gssCredential);
 
-} catch (CommunicationException | ServiceUnavailableException e) {
+} catch (NamingException e) {
+/* While we would like to catch specialized exceptions like
+ * CommunicationException and ServiceUnavailableException,
+ * some network communication problems are reported as
+ * this general exception. This is fixed in Java 18 by
+ * https://bugs.openjdk.org/browse/JDK-8273402
+ */
 // log the exception so we know it's there.
 containerLog.info(sm.getString("jndiRealm.exception.retry"), 
e);
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 246b17c9c3..a2631300b4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
 presistence process, do not log a warning that null Principals are not
 serializable. Pull request 638 provided by tsryo. (markt)
   
+  
+Catch NamingException in 
JNDIRealm#getPrincipal.
+It is used in Java up to 17 to signal closed connections. (fschumacher)
+  
 
   
   


-
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: Guard new escape routines for null values

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 7d709b5  Guard new escape routines for null values
7d709b5 is described below

commit 7d709b57592103e28a6a66e9a4017b8af4d515bd
Author: Felix Schumacher 
AuthorDate: Sat May 15 14:06:21 2021 +0200

Guard new escape routines for null values

NPE in JNDIRealm, when userRoleAttribute is not set.
Plus add path to UnboundID SDK to the Eclipse and Intellij
classpath settings.

Bugzilla Id: 63508
---
 java/org/apache/catalina/realm/JNDIRealm.java | 6 ++
 webapps/docs/changelog.xml| 8 
 2 files changed, 14 insertions(+)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 6425194..887d6d1 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2769,6 +2769,9 @@ public class JNDIRealm extends RealmBase {
  * @return String the escaped/encoded result
  */
 protected String doFilterEscaping(String inString) {
+if (inString == null) {
+return null;
+}
 StringBuilder buf = new StringBuilder(inString.length());
 for (int i = 0; i < inString.length(); i++) {
 char c = inString.charAt(i);
@@ -2861,6 +2864,9 @@ public class JNDIRealm extends RealmBase {
  * @return  The string representation of the attribute value
  */
 protected String doAttributeValueEscaping(String input) {
+if (input == null) {
+return null;
+}
 int len = input.length();
 StringBuilder result = new StringBuilder();
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef125b2..1994d8c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+63508: NPE in JNDIRealm when no 
userRoleAttribute
+    is given. (fschumacher)
+  
+
+  
   
 
   

-
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: Guard new escape routines for null values

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 edd46e4  Guard new escape routines for null values
edd46e4 is described below

commit edd46e498d9039bf9d47aa5169da279362dd3f66
Author: Felix Schumacher 
AuthorDate: Sat May 15 14:06:21 2021 +0200

Guard new escape routines for null values

NPE in JNDIRealm, when userRoleAttribute is not set.
Plus add path to UnboundID SDK to the Eclipse and Intellij
classpath settings.

Bugzilla Id: 63508
---
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 
 res/ide-support/eclipse/eclipse.classpath  |  1 +
 res/ide-support/idea/tomcat.iml|  9 +
 .../catalina/realm/TestJNDIRealmIntegration.java   | 42 --
 webapps/docs/changelog.xml |  8 +
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index f1354d1..cbef335 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2804,6 +2804,9 @@ public class JNDIRealm extends RealmBase {
  * @return String the escaped/encoded result
  */
 protected String doFilterEscaping(String inString) {
+if (inString == null) {
+return null;
+}
 StringBuilder buf = new StringBuilder(inString.length());
 for (int i = 0; i < inString.length(); i++) {
 char c = inString.charAt(i);
@@ -2896,6 +2899,9 @@ public class JNDIRealm extends RealmBase {
  * @return  The string representation of the attribute value
  */
 protected String doAttributeValueEscaping(String input) {
+if (input == null) {
+return null;
+}
 int len = input.length();
 StringBuilder result = new StringBuilder();
 
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 0c67505..da8f013 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,5 +29,6 @@
 
 
 
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index c7a9c03..f180cfb 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -110,6 +110,15 @@
 
   
 
+
+  
+
+  
+
+
+
+  
+
 
   
 
diff --git a/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java 
b/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
index e52d7c2..99d537d 100644
--- a/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
+++ b/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
@@ -58,26 +58,33 @@ public class TestJNDIRealmIntegration {
 @Parameterized.Parameters(name = "{index}: user[{5}], pwd[{6}]")
 public static Collection parameters() {
 List parameterSets = new ArrayList<>();
-for (String roleSearch : new String[] { ROLE_SEARCH_A, ROLE_SEARCH_B, 
ROLE_SEARCH_C }) {
-addUsers(USER_PATTERN, null, null, roleSearch, ROLE_BASE, 
parameterSets);
-addUsers(null, USER_SEARCH, USER_BASE, roleSearch, ROLE_BASE, 
parameterSets);
+for (String userRoleAttribute : new String[] { "cn", null }) {
+for (String roleSearch : new String[] { ROLE_SEARCH_A, 
ROLE_SEARCH_B, ROLE_SEARCH_C }) {
+if (userRoleAttribute != null) {
+addUsers(USER_PATTERN, null, null, roleSearch, ROLE_BASE, 
userRoleAttribute, parameterSets);
+addUsers(null, USER_SEARCH, USER_BASE, roleSearch, 
ROLE_BASE, userRoleAttribute, parameterSets);
+}
+}
+parameterSets.add(new Object[] { 
"cn={0},ou=s\\;ub,ou=people,dc=example,dc=com", null, null, ROLE_SEARCH_A,
+"{3},ou=people,dc=example,dc=com", "testsub", "test", new 
String[] { "TestGroup4" },
+userRoleAttribute });
 }
-parameterSets.add(new Object[] { 
"cn={0},ou=s\\;ub,ou=people,dc=example,dc=com", null, null, ROLE_SEARCH_A,
-"{3},ou=people,dc=example,dc=com", "testsub", "test", new 
String[] {"TestGroup4"} });
 return parameterSets;
 }
 
 
 private static void addUsers(String userPattern, String userSearch, String 
userBase, String roleSearch,
-String roleBase, List parameterSets) {
+String roleBase, String userRoleAttribute, List 
parameterSets) {
 parameterSets.add(new Object[] { userPattern, userSearch, userBase, 
roleSearch, ro

[tomcat] branch 9.0.x updated: Guard new escape routines for null values

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 937b156  Guard new escape routines for null values
937b156 is described below

commit 937b1568afa18f410c6664214246e010c661d419
Author: Felix Schumacher 
AuthorDate: Sat May 15 14:06:21 2021 +0200

Guard new escape routines for null values

NPE in JNDIRealm, when userRoleAttribute is not set.
Plus add path to UnboundID SDK to the Eclipse and Intellij
classpath settings.

Bugzilla Id: 63508
---
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 
 res/ide-support/eclipse/eclipse.classpath  |  1 +
 res/ide-support/idea/tomcat.iml|  9 +
 .../catalina/realm/TestJNDIRealmIntegration.java   | 42 --
 webapps/docs/changelog.xml |  8 +
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 5648201..315d9e6 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2789,6 +2789,9 @@ public class JNDIRealm extends RealmBase {
  * @return String the escaped/encoded result
  */
 protected String doFilterEscaping(String inString) {
+if (inString == null) {
+return null;
+}
 StringBuilder buf = new StringBuilder(inString.length());
 for (int i = 0; i < inString.length(); i++) {
 char c = inString.charAt(i);
@@ -2881,6 +2884,9 @@ public class JNDIRealm extends RealmBase {
  * @return  The string representation of the attribute value
  */
 protected String doAttributeValueEscaping(String input) {
+if (input == null) {
+return null;
+}
 int len = input.length();
 StringBuilder result = new StringBuilder();
 
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index cf76744..c7985ef 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -30,5 +30,6 @@
 
 
 
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index ae752a6..b211df2 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -119,6 +119,15 @@
 
   
 
+
+  
+
+  
+
+
+
+  
+
 
   
 
diff --git a/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java 
b/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
index e52d7c2..99d537d 100644
--- a/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
+++ b/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
@@ -58,26 +58,33 @@ public class TestJNDIRealmIntegration {
 @Parameterized.Parameters(name = "{index}: user[{5}], pwd[{6}]")
 public static Collection parameters() {
 List parameterSets = new ArrayList<>();
-for (String roleSearch : new String[] { ROLE_SEARCH_A, ROLE_SEARCH_B, 
ROLE_SEARCH_C }) {
-addUsers(USER_PATTERN, null, null, roleSearch, ROLE_BASE, 
parameterSets);
-addUsers(null, USER_SEARCH, USER_BASE, roleSearch, ROLE_BASE, 
parameterSets);
+for (String userRoleAttribute : new String[] { "cn", null }) {
+for (String roleSearch : new String[] { ROLE_SEARCH_A, 
ROLE_SEARCH_B, ROLE_SEARCH_C }) {
+if (userRoleAttribute != null) {
+addUsers(USER_PATTERN, null, null, roleSearch, ROLE_BASE, 
userRoleAttribute, parameterSets);
+addUsers(null, USER_SEARCH, USER_BASE, roleSearch, 
ROLE_BASE, userRoleAttribute, parameterSets);
+}
+}
+parameterSets.add(new Object[] { 
"cn={0},ou=s\\;ub,ou=people,dc=example,dc=com", null, null, ROLE_SEARCH_A,
+"{3},ou=people,dc=example,dc=com", "testsub", "test", new 
String[] { "TestGroup4" },
+userRoleAttribute });
 }
-parameterSets.add(new Object[] { 
"cn={0},ou=s\\;ub,ou=people,dc=example,dc=com", null, null, ROLE_SEARCH_A,
-"{3},ou=people,dc=example,dc=com", "testsub", "test", new 
String[] {"TestGroup4"} });
 return parameterSets;
 }
 
 
 private static void addUsers(String userPattern, String userSearch, String 
userBase, String roleSearch,
-String roleBase, List parameterSets) {
+String roleBase, String userRoleAttribute, List 
parameterSets) {
 parameterSets.add(new Object[] { userPattern, userSearch, userBase, 
roleSearch, ro

[tomcat] branch master updated: Guard new escape routines for null values

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 939efed  Guard new escape routines for null values
939efed is described below

commit 939efedccff7fafc45eedb11dcce67cd92975364
Author: Felix Schumacher 
AuthorDate: Sat May 15 14:06:21 2021 +0200

Guard new escape routines for null values

NPE in JNDIRealm, when userRoleAttribute is not set.
Plus add path to UnboundID SDK to the Eclipse and Intellij
classpath settings.

Bugzilla Id: 63508
---
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 
 res/ide-support/eclipse/eclipse.classpath  |  1 +
 res/ide-support/idea/tomcat.iml|  9 +
 .../catalina/realm/TestJNDIRealmIntegration.java   | 42 --
 webapps/docs/changelog.xml |  8 +
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 04768e8..b6318b4 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2788,6 +2788,9 @@ public class JNDIRealm extends RealmBase {
  * @return String the escaped/encoded result
  */
 protected String doFilterEscaping(String inString) {
+if (inString == null) {
+return null;
+}
 StringBuilder buf = new StringBuilder(inString.length());
 for (int i = 0; i < inString.length(); i++) {
 char c = inString.charAt(i);
@@ -2880,6 +2883,9 @@ public class JNDIRealm extends RealmBase {
  * @return  The string representation of the attribute value
  */
 protected String doAttributeValueEscaping(String input) {
+if (input == null) {
+return null;
+}
 int len = input.length();
 StringBuilder result = new StringBuilder();
 
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 857b557..2b99428 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -31,5 +31,6 @@
 
 
 
+
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 2c10049..11d1909 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -128,6 +128,15 @@
 
   
 
+
+  
+
+  
+
+
+
+  
+
 
   
 
diff --git a/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java 
b/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
index e52d7c2..99d537d 100644
--- a/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
+++ b/test/org/apache/catalina/realm/TestJNDIRealmIntegration.java
@@ -58,26 +58,33 @@ public class TestJNDIRealmIntegration {
 @Parameterized.Parameters(name = "{index}: user[{5}], pwd[{6}]")
 public static Collection parameters() {
 List parameterSets = new ArrayList<>();
-for (String roleSearch : new String[] { ROLE_SEARCH_A, ROLE_SEARCH_B, 
ROLE_SEARCH_C }) {
-addUsers(USER_PATTERN, null, null, roleSearch, ROLE_BASE, 
parameterSets);
-addUsers(null, USER_SEARCH, USER_BASE, roleSearch, ROLE_BASE, 
parameterSets);
+for (String userRoleAttribute : new String[] { "cn", null }) {
+for (String roleSearch : new String[] { ROLE_SEARCH_A, 
ROLE_SEARCH_B, ROLE_SEARCH_C }) {
+if (userRoleAttribute != null) {
+addUsers(USER_PATTERN, null, null, roleSearch, ROLE_BASE, 
userRoleAttribute, parameterSets);
+addUsers(null, USER_SEARCH, USER_BASE, roleSearch, 
ROLE_BASE, userRoleAttribute, parameterSets);
+}
+}
+parameterSets.add(new Object[] { 
"cn={0},ou=s\\;ub,ou=people,dc=example,dc=com", null, null, ROLE_SEARCH_A,
+"{3},ou=people,dc=example,dc=com", "testsub", "test", new 
String[] { "TestGroup4" },
+userRoleAttribute });
 }
-parameterSets.add(new Object[] { 
"cn={0},ou=s\\;ub,ou=people,dc=example,dc=com", null, null, ROLE_SEARCH_A,
-"{3},ou=people,dc=example,dc=com", "testsub", "test", new 
String[] {"TestGroup4"} });
 return parameterSets;
 }
 
 
 private static void addUsers(String userPattern, String userSearch, String 
userBase, String roleSearch,
-String roleBase, List parameterSets) {
+String roleBase, String userRoleAttribute, List 
parameterSets) {
 parameterSets.add(new Object[] { userPattern, userSearch, userBase, 
roleSearch, ro

svn commit: r1888869 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

[fschumacher]

Author: fschumacher
Date: Sat Apr 17 19:20:18 2021
New Revision: 169

URL: http://svn.apache.org/viewvc?rev=169=rev
Log:
Add link to slides

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=169=168=169=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Sat Apr 17 19:20:18 2021
@@ -46,6 +46,7 @@ li.targeted {
   
   
 Lost in the Docs - Felix Schumacher,
+https://people.apache.org/~fschumacher/presentations/Lost-in-the-docs-ApacheConHome20.pdf;>slides,
 https://www.youtube.com/watch?v=pSU0l5kbcJ8;>video
   
   

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=169=168=169=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Sat Apr 17 19:20:18 2021
@@ -52,6 +52,7 @@ li.targeted {
   
   
 Lost in the Docs - Felix Schumacher,
+https://people.apache.org/~fschumacher/presentations/Lost-in-the-docs-ApacheConHome20.pdf;>slides,
 https://www.youtube.com/watch?v=pSU0l5kbcJ8;>video
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1888737 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml

[fschumacher]

Author: fschumacher
Date: Tue Apr 13 15:51:05 2021
New Revision: 1888737

URL: http://svn.apache.org/viewvc?rev=1888737=rev
Log:
a late Happy New Year :)

Modified:
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/xdocs/legal.xml

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1888737=1888736=1888737=diff
==
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Tue Apr 13 15:51:05 2021
@@ -4,7 +4,7 @@
 Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentLegal Stuff They Make Us Say
 
 
-All material on this website is Copyright  1999-2020, The Apache 
+All material on this website is Copyright  1999-2021, The Apache 
 Software Foundation
 
 

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1888737=1888736=1888737=diff
==
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Tue Apr 13 15:51:05 2021
@@ -11,7 +11,7 @@
   
 
 
-All material on this website is Copyright  1999-2020, The Apache 
+All material on this website is Copyright  1999-2021, The Apache 
 Software Foundation
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1888736 - in /tomcat/site/trunk: docs/presentations.html docs/sitemap-main.xml xdocs/presentations.xml xdocs/sitemap-main.xml

[fschumacher]

Author: fschumacher
Date: Tue Apr 13 15:43:22 2021
New Revision: 1888736

URL: http://svn.apache.org/viewvc?rev=1888736=rev
Log:
Add presentations for ApacheCon @Home 2020

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/sitemap-main.xml
tomcat/site/trunk/xdocs/presentations.xml
tomcat/site/trunk/xdocs/sitemap-main.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1888736=1888735=1888736=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Tue Apr 13 15:43:22 2021
@@ -38,6 +38,62 @@ li.targeted {
   transition:ease-in-out 1s;
 }
 
+ApacheCon @Home 
2020
+
+  
+State of the Cat - Mark Thomas,
+https://www.youtube.com/watch?v=uDy-Dwexy2Q;>video
+  
+  
+Lost in the Docs - Felix Schumacher,
+https://www.youtube.com/watch?v=pSU0l5kbcJ8;>video
+  
+  
+Deploying a Production Instance - Andrew Carr,
+https://www.youtube.com/watch?v=V75wPfhYsj4;>video
+  
+  
+HTTP/2, HTTP/3, and SSL/TLS State of the Art in our Servers (httpd, 
Traffic Server, and Tomcat) - Jean-Frederic Clere,
+https://www.youtube.com/watch?v=xzqOU6ILJzQ;>video
+  
+  
+Split your Tomcat Installation for Easier Upgrades - Christopher Schultz,
+https://www.youtube.com/watch?v=nu229pb09D0;>video
+  
+  
+Tomcat: New and Upcoming - Rmy Maucherat,
+https://www.youtube.com/watch?v=L5PFoJyS-aU;>video
+  
+  
+Reverse-Proxying with nginx - Igal Sapir,
+https://www.youtube.com/watch?v=8e1V9tVwNR8;>video
+  
+  
+Tomcat: From a Cluster to a Cloud - Jean-Frederic Clere,
+https://www.youtube.com/watch?v=COsTWphp2fk;>video
+  
+  
+Migrating from AJP to HTTP: It's About Time - Christopher Schultz,
+https://www.youtube.com/watch?v=qUjUEvGFstI;>video
+  
+  
+Tomcat 10 and Jakarta EE - Mark Thomas,
+https://www.youtube.com/watch?v=10PkrWRPgPU;>video
+  
+  
+Getting Started Hacking Tomcat - Christopher Schultz,
+https://www.youtube.com/watch?v=O2wXAldxQWA;>video
+  
+  
+Apache Tomcat and Spring Boot - Andrew Carr,
+https://www.youtube.com/watch?v=Nk-rKXQC0BU;>video
+  
+  
+Openly Handling Security Vulnerabilities (QA/Panel) - Mark Thomas, 
Christopher Schultz, Coty Sutherland,
+https://www.youtube.com/watch?v=tGjyX6meGcA;>video
+  
+
+
 Webinar Series 
2020
 
   

Modified: tomcat/site/trunk/docs/sitemap-main.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/sitemap-main.xml?rev=1888736=1888735=1888736=diff
==
--- tomcat/site/trunk/docs/sitemap-main.xml (original)
+++ tomcat/site/trunk/docs/sitemap-main.xml Tue Apr 13 15:43:22 2021
@@ -177,6 +177,11 @@
 0.4
   
   
+http://tomcat.apache.org/presentations.html
+monthly
+0.4
+  
+  
 http://tomcat.apache.org/whoweare.html
 weekly
 0.5
@@ -186,4 +191,4 @@
 weekly
 0.5
   
-
\ No newline at end of file
+

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1888736=1888735=1888736=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Tue Apr 13 15:43:22 2021
@@ -44,6 +44,62 @@ li.targeted {
   transition:ease-in-out 1s;
 }
 
+
+
+  
+State of the Cat - Mark Thomas,
+https://www.youtube.com/watch?v=uDy-Dwexy2Q;>video
+  
+  
+Lost in the Docs - Felix Schumacher,
+https://www.youtube.com/watch?v=pSU0l5kbcJ8;>video
+  
+  
+Deploying a Production Instance - Andrew Carr,
+https://www.youtube.com/watch?v=V75wPfhYsj4;>video
+  
+  
+HTTP/2, HTTP/3, and SSL/TLS State of the Art in our Servers (httpd, 
Traffic Server, and Tomcat) - Jean-Frederic Clere,
+https://www.youtube.com/watch?v=xzqOU6ILJzQ;>video
+  
+  
+Split your Tomcat Installation for Easier Upgrades - Christopher Schultz,
+https://www.youtube.com/watch?v=nu229pb09D0;>video
+  
+  
+Tomcat: New and Upcoming - Rémy Maucherat,
+https://www.youtube.com/watch?v=L5PFoJyS-aU;>video
+  
+  
+Reverse-Proxying with nginx - Igal Sapir,
+https://www.youtube.com/watch?v=8e1V9tVwNR8;>video
+  
+  
+Tomcat: From a Cluster to a Cloud - Jean-Frederic Clere,
+https://www.youtube.com/watch?v=COsTWphp2fk;>video
+  
+  
+Migrating from AJP to HTTP: It's About Time - Christopher Schultz,
+https://www.youtube.com/watch?v=qUjUEvGFstI;>video
+  
+  
+Tomcat 10 and Jakarta EE - Mark Thomas,
+https://www.youtube.com/watch?v=10PkrWRPgPU;>video
+  
+  
+Getting Started Hacking Tomcat - Christopher Schultz,
+https://www.youtube.com/

[tomcat-connectors] branch master updated: Markup changes

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 282784c  Markup changes
282784c is described below

commit 282784c429632c200294565a0a18b692ce9d86b6
Author: Felix Schumacher 
AuthorDate: Wed Jan 6 20:13:37 2021 +0100

Markup changes

Use bold and code tags more consistently on code fragments. Added one space
after a closing tag and removed one underscore from `lb_factor`.
---
 xdocs/reference/workers.xml | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/xdocs/reference/workers.xml b/xdocs/reference/workers.xml
index 039469b..d697d52 100644
--- a/xdocs/reference/workers.xml
+++ b/xdocs/reference/workers.xml
@@ -91,7 +91,7 @@ noted in the tables below.
 
 
 Whitespace at the beginning and the end of a property name or value gets 
ignored.
-Comments can be placed in any line and start with a hash sign '#'.
+Comments can be placed in any line and start with a hash sign '#'.
 Any line contents behind the hash sign get ignored.
 
 
@@ -111,19 +111,19 @@ These directives have global scope.
 
 A comma separated list of workers names that the JK will use. When starting up,
 the web server plugin will instantiate the workers whose name appears in the
-worker.list property, these are also the workers to whom you can map requests.
+worker.list property, these are also the workers to whom you can map 
requests.
 
 This directive can be used multiple times.
 
 
 
 Worker connection pool maintain interval in seconds. If set to the positive
-value JK will scan all connections for all workers specified in worker.list
+value JK will scan all connections for all workers specified in 
worker.list
 directive and check if connections needs to be recycled.
 
-Furthermore any load balancer does a global maintenance every worker.maintain
+Furthermore any load balancer does a global maintenance every 
worker.maintain
 seconds. During global maintenance load counters are decayed and workers
-in error are checked for recover_time.
+in error are checked for recover_time.
 
 
 This feature has been added in jk 1.2.13.
@@ -151,17 +151,17 @@ The name of the worker can contain only the alphanumeric 
characters
 
 
 
-You can define and use variables in the workers.properties file.
+You can define and use variables in the workers.properties file.
 To define a variable you use the syntax:
 
 variable_name=value
 
 Dots are allowed in the variable name, but you have to be careful
 not to use variable names, that clash with standard directives.
-Therefore variable names should never start with "worker.".
+Therefore variable names should never start with "worker.".
 
 
-To use a variable, you can insert "$(variable_name)" at any place
+To use a variable, you can insert "$(variable_name)" at any place
 on the value side of a property line. If a variable has not been
 defined before its use, we will search the process environment for
 a variable with the same name and use their value.
@@ -175,22 +175,22 @@ the file, you can inherit properties from one worker to 
another, or even
 from a template to real workers.
 
 
-The directive "reference" allows to copy configurations between workers or
-worker templates in a hierarchical way. If worker castor sets
+The directive "reference" allows to copy configurations between workers 
or
+worker templates in a hierarchical way. If worker castor sets
 worker.castor.reference=worker.pollux then it inherits all properties
 of pollux, except for the ones that are explicitly set for 
castor.
 
 
 Please note, that the value of the directive is not only the name of the 
referred worker,
-but the complete prefix including "worker.".
+but the complete prefix including "worker.".
 
 
 To use a template worker simply define it like a real worker, but do not add it
-to the "worker.list" or as a member to any load balancer. Such a template 
worker
+to the worker.list or as a member to any load balancer. Such a template 
worker
 does not have to contain mandatory directives. This approach is especially 
useful,
 if one has a lot of balanced workers in a load balancer
 and these workers share most of their properties. You can set all of these 
properties
-in a template worker, e.g. using the prefix "worker.template1", and then simply
+in a template worker, e.g. using the prefix "worker.template1", and 
then simply
 reference those common properties in all balanced workers.
 
 
@@ -211,7 +211,7 @@ be unavailable or will misbehave. Those directives will be 
marked with a 
 
 
-Type of the worker (can be one of ajp12, ajp13, ajp14, jni, lb or status). The 
type of the worker
+Type of the worker (can be one o

[tomcat] branch pr309-recursion deleted (was 7f1b56e)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch pr309-recursion
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


 was 7f1b56e  Use method local counter for recurstion

This change permanently discards the following revisions:

 discard 7f1b56e  Use method local counter for recurstion
 discard 57e83d7  Add a iterationCount limited to 20 to prevent 
StackOverflowError.
 discard 4f1ae64  Allow recursive substitution of properties.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] reference refs/remotes/origin/pr/309 created (now 4fc54d5)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to reference refs/remotes/origin/pr/309
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 4fc54d5  Add a iterationCount limited to 20 to prevent 
StackOverflowError.

No new revisions were added by this update.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/03: Allow recursive substitution of properties.

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch pr309-recursion
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 4f1ae64882486eeb0b60f9daf13daeca5df6b7c9
Author: Jean-Frederic Clere 
AuthorDate: Fri Jun 26 09:50:09 2020 +0200

Allow recursive substitution of properties.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 78ab66f..977d33a 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -332,7 +332,15 @@ public final class IntrospectionUtils {
 }
 if (prev < value.length())
 sb.append(value.substring(prev));
-return sb.toString();
+String newval = sb.toString();
+if (newval.indexOf('$') < 0) {
+return newval;
+}
+if (newval.equals(value))
+return value;
+if (log.isDebugEnabled())
+log.debug("IntrospectionUtils.replaceProperties iter on: " + 
newval);
+return replaceProperties(newval, staticProp, dynamicProp, classLoader);
 }
 
 private static String getProperty(String name, Hashtable 
staticProp,


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch pr309-recursion created (now 7f1b56e)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch pr309-recursion
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 7f1b56e  Use method local counter for recurstion

This branch includes the following new commits:

 new 4f1ae64  Allow recursive substitution of properties.
 new 57e83d7  Add a iterationCount limited to 20 to prevent 
StackOverflowError.
 new 7f1b56e  Use method local counter for recurstion

The 3 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.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Add a iterationCount limited to 20 to prevent StackOverflowError.

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch pr309-recursion
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 57e83d7c9eaa784d3af54fa57de100c99515f1bc
Author: Jean-Frederic Clere 
AuthorDate: Fri Jun 26 15:18:30 2020 +0200

Add a iterationCount limited to 20 to prevent StackOverflowError.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 977d33a..17fd47e 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -34,6 +34,7 @@ public final class IntrospectionUtils {
 
 private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
 private static final StringManager sm = 
StringManager.getManager(IntrospectionUtils.class);
+private static int iterationCount = 0;
 
 /**
  * Find a method with the right name If found, call the method ( if param 
is
@@ -340,7 +341,13 @@ public final class IntrospectionUtils {
 return value;
 if (log.isDebugEnabled())
 log.debug("IntrospectionUtils.replaceProperties iter on: " + 
newval);
-return replaceProperties(newval, staticProp, dynamicProp, classLoader);
+iterationCount++;
+if (iterationCount <20)
+newval = replaceProperties(newval, staticProp, dynamicProp, 
classLoader);
+else
+log.warn("System property failed to update and remains [" + newval 
+ "]");
+iterationCount--;
+return newval;
 }
 
 private static String getProperty(String name, Hashtable 
staticProp,


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/03: Use method local counter for recurstion

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch pr309-recursion
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7f1b56e587693bb8f7755c972fbac493101c53c8
Author: Felix Schumacher 
AuthorDate: Fri Jun 26 16:58:25 2020 +0200

Use method local counter for recurstion
---
 java/org/apache/tomcat/util/IntrospectionUtils.java   | 19 +++
 .../apache/tomcat/util/TestIntrospectionUtils.java|  7 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 17fd47e..08e0cbd 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -34,7 +34,7 @@ public final class IntrospectionUtils {
 
 private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
 private static final StringManager sm = 
StringManager.getManager(IntrospectionUtils.class);
-private static int iterationCount = 0;
+private static final int MAX_RECURSION = 20;
 
 /**
  * Find a method with the right name If found, call the method ( if param 
is
@@ -286,7 +286,16 @@ public final class IntrospectionUtils {
 public static String replaceProperties(String value,
 Hashtable staticProp, PropertySource dynamicProp[],
 ClassLoader classLoader) {
+return replaceProperties(value, staticProp, dynamicProp, classLoader, 
0);
+}
 
+private static String replaceProperties(String value,
+Hashtable staticProp, PropertySource dynamicProp[],
+ClassLoader classLoader, int iterationCount) {
+if (iterationCount >= MAX_RECURSION) {
+log.warn("System property failed to update and remains [" + value 
+ "]");
+return value;
+}
 if (value.indexOf('$') < 0) {
 return value;
 }
@@ -341,13 +350,7 @@ public final class IntrospectionUtils {
 return value;
 if (log.isDebugEnabled())
 log.debug("IntrospectionUtils.replaceProperties iter on: " + 
newval);
-iterationCount++;
-if (iterationCount <20)
-newval = replaceProperties(newval, staticProp, dynamicProp, 
classLoader);
-else
-log.warn("System property failed to update and remains [" + newval 
+ "]");
-iterationCount--;
-return newval;
+return replaceProperties(newval, staticProp, dynamicProp, classLoader, 
iterationCount + 1);
 }
 
 private static String getProperty(String name, Hashtable 
staticProp,
diff --git a/test/org/apache/tomcat/util/TestIntrospectionUtils.java 
b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
index ed9fe39..981db4b 100644
--- a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
+++ b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
@@ -112,6 +112,13 @@ public class TestIntrospectionUtils {
 StandardContext.class, "com.example.Other"));
 }
 
+@Test
+public void testReplacePropertiesRecursive() {
+Properties properties = new Properties();
+properties.put("replaceMe", "x${replaceMe}");
+Assert.assertEquals("${replaceMe}",
+IntrospectionUtils.replaceProperties("${replaceMe}", 
properties, null, null));
+}
 
 @Test
 public void testReplaceProperties() {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Use the correct file to grep for failures in travis

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 22b4f77  Use the correct file to grep for failures in travis
22b4f77 is described below

commit 22b4f7752aa33d34a206417854c9c04f408eac11
Author: Felix Schumacher 
AuthorDate: Fri Jun 19 06:56:40 2020 +0200

Use the correct file to grep for failures in travis
---
 .travis/antTest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/antTest.sh b/.travis/antTest.sh
index cc40bad..0e266e6 100755
--- a/.travis/antTest.sh
+++ b/.travis/antTest.sh
@@ -23,7 +23,7 @@
 ant -q test 2>&1 > ant-test.log
 RC=$?
 {
-if grep -q "Testsuites with failed tests:"; then
+if grep -q "Testsuites with failed tests:" ant-test.log; then
 for failed in $(awk 'failed == 1 { print $2 }; /Testsuites with failed 
tests:/ { failed=1 }' ant-test.log); do
 echo "Failed test: $failed"
 cat output/build/logs/$failed


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Try to print out more information forx failed tests in travis

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 14053be  Try to print out more information forx failed tests in travis
14053be is described below

commit 14053be4e6863afffbbc7b01d5098565034f289e
Author: Felix Schumacher 
AuthorDate: Thu Jun 18 19:42:55 2020 +0200

Try to print out more information forx failed tests in travis
---
 .travis.yml|  1 +
 .travis/antTest.sh | 11 +++
 2 files changed, 12 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2ae1a0d..3d9cecd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,7 @@ script:
 
 after_failure:
 - tail -n 5000 ant-test.log
+- tail -n 5000 test-failures.log
 - ls -laR $HOME/tomcat-build-libs
 
 notifications:
diff --git a/.travis/antTest.sh b/.travis/antTest.sh
index 22ce104..cc40bad 100755
--- a/.travis/antTest.sh
+++ b/.travis/antTest.sh
@@ -21,3 +21,14 @@
 # much logging on stdout
 
 ant -q test 2>&1 > ant-test.log
+RC=$?
+{
+if grep -q "Testsuites with failed tests:"; then
+for failed in $(awk 'failed == 1 { print $2 }; /Testsuites with failed 
tests:/ { failed=1 }' ant-test.log); do
+echo "Failed test: $failed"
+cat output/build/logs/$failed
+echo
+done
+fi
+} > test-failures.log
+exit $RC


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Use current versions of OpenJDK for travis builds

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 81beb93  Use current versions of OpenJDK for travis builds
81beb93 is described below

commit 81beb93a6bbb0ec9e72ce761950bd513b8626532
Author: Felix Schumacher 
AuthorDate: Thu Jun 18 19:24:17 2020 +0200

Use current versions of OpenJDK for travis builds

Second try, as the first commit of this 
(d53dbca6db1c1456c0e1fa544dc360dc230141f6) seems
to have been lost.
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d0688ba..2ae1a0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,9 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz;
-- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.5_10.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz;
+- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test 
"$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Use current versions of OpenJDK for travis builds

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 d53dbca  Use current versions of OpenJDK for travis builds
d53dbca is described below

commit d53dbca6db1c1456c0e1fa544dc360dc230141f6
Author: Felix Schumacher 
AuthorDate: Wed Jun 17 17:16:11 2020 +0200

Use current versions of OpenJDK for travis builds
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d0688ba..2ae1a0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,9 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz;
-- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.5_10.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz;
+- 
JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test 
"$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi


-
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: Use current ant for download from travis build and change URL to https

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 3b7e685  Use current ant for download from travis build and change URL 
to https
3b7e685 is described below

commit 3b7e685e176029c2a009aa4dd9420361d9614047
Author: Felix Schumacher 
AuthorDate: Sun Jun 14 17:55:12 2020 +0200

Use current ant for download from travis build and change URL to https
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24f07da..1441aa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ install:
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - mv jdk8* jdk
 - export JAVA_HOME=`pwd`/jdk
-- wget -q 
http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
-- export ANT_HOME=`pwd`/apache-ant-1.10.7
+- wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
+- export ANT_HOME=`pwd`/apache-ant-1.10.8
 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
 - java -version
 - ant -version


-
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: Use current ant for download from travis build and change URL to https

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 0b6eb11  Use current ant for download from travis build and change URL 
to https
0b6eb11 is described below

commit 0b6eb11147917c299b7a59ac2a9ca9b0af22af2a
Author: Felix Schumacher 
AuthorDate: Sun Jun 14 17:55:12 2020 +0200

Use current ant for download from travis build and change URL to https
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24f07da..1441aa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ install:
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - mv jdk8* jdk
 - export JAVA_HOME=`pwd`/jdk
-- wget -q 
http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
-- export ANT_HOME=`pwd`/apache-ant-1.10.7
+- wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
+- export ANT_HOME=`pwd`/apache-ant-1.10.8
 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
 - java -version
 - ant -version


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Set ANT_HOME in travis to the updated version

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 35791fc  Set ANT_HOME in travis to the updated version
35791fc is described below

commit 35791fcc26333ce553dc028a4a8e9b6d3a30ec41
Author: Felix Schumacher 
AuthorDate: Sun Jun 14 17:58:41 2020 +0200

Set ANT_HOME in travis to the updated version
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a0b3c70..d0688ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ install:
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi
 - export JAVA_HOME=`pwd`/jdk
 - wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
-- export ANT_HOME=`pwd`/apache-ant-1.10.7
+- export ANT_HOME=`pwd`/apache-ant-1.10.8
 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
 - java -version
 - ant -version


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Use current ant for download from travis build and change URL to https

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 9eb3ac3  Use current ant for download from travis build and change URL 
to https
9eb3ac3 is described below

commit 9eb3ac32b0856055177517f1bdb3a8be53678971
Author: Felix Schumacher 
AuthorDate: Sun Jun 14 17:55:12 2020 +0200

Use current ant for download from travis build and change URL to https
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2ceb7f5..a0b3c70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ install:
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi
 - export JAVA_HOME=`pwd`/jdk
-- wget -q 
http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
+- wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
 - export ANT_HOME=`pwd`/apache-ant-1.10.7
 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH"
 - java -version


-
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: Re-use roles and groups defined on users on MemoryUserDatabase creation

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 61e533f  Re-use roles and groups defined on users on 
MemoryUserDatabase creation
61e533f is described below

commit 61e533f322f33de6cb4c78e9116baff22b880021
Author: Felix Schumacher 
AuthorDate: Thu May 14 20:19:18 2020 +0200

Re-use roles and groups defined on users on MemoryUserDatabase creation

When the XML file for MemoryUserDatabse is digested, the order of the
elements was important. It had to be roles, groups and than users.
With this patch the order of the elements is not important anymore.
If a user element defined a role or group before the corresponding
role or group element, we now will re-use that element and add a
possibly missing description.

Bugzilla Id: 64442
---
 conf/tomcat-users.xsd | 12 ++--
 .../org/apache/catalina/users/MemoryUserDatabase.java | 19 ---
 webapps/docs/changelog.xml|  4 
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/conf/tomcat-users.xsd b/conf/tomcat-users.xsd
index 948bd01..6a3446c 100644
--- a/conf/tomcat-users.xsd
+++ b/conf/tomcat-users.xsd
@@ -24,21 +24,21 @@
version="1.0">
   
 
-  
-
+  
+
   
 
 
   
 
-
+
   
 
 
 
   
 
-
+
   
 
 
@@ -47,7 +47,7 @@
 
   
 
-  
+  
   
 
   
@@ -56,4 +56,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java 
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 1f44202..efde670 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -751,7 +751,14 @@ class MemoryGroupCreationFactory extends 
AbstractObjectCreationFactory {
 }
 String description = attributes.getValue("description");
 String roles = attributes.getValue("roles");
-Group group = database.createGroup(groupname, description);
+Group group = database.findGroup(groupname);
+if (group == null) {
+group = database.createGroup(groupname, description);
+} else {
+if (group.getDescription() == null) {
+group.setDescription(description);
+}
+}
 if (roles != null) {
 while (roles.length() > 0) {
 String rolename = null;
@@ -796,8 +803,14 @@ class MemoryRoleCreationFactory extends 
AbstractObjectCreationFactory {
 rolename = attributes.getValue("name");
 }
 String description = attributes.getValue("description");
-Role role = database.createRole(rolename, description);
-return role;
+Role existingRole = database.findRole(rolename);
+if (existingRole == null) {
+return database.createRole(rolename, description);
+}
+if (existingRole.getDescription() == null) {
+existingRole.setDescription(description);
+}
+return existingRole;
 }
 
 private final MemoryUserDatabase database;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0ce02e6..cb81ea7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -64,6 +64,10 @@
 Implement a few rewrite SSL env that correspond to Servlet request
 attributes. (remm)
   
+  
+64442Be more flexible with respect to the ordering of 
groups,
+roles and users in the tomcat-users.xml file. 
(fschumacher)
+  
 
   
   


-
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: Re-use roles and groups defined on users on MemoryUserDatabase creation

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 25260cd  Re-use roles and groups defined on users on 
MemoryUserDatabase creation
25260cd is described below

commit 25260cd3ca707153ba9f156f29d7c974ffb224d8
Author: Felix Schumacher 
AuthorDate: Thu May 14 20:19:18 2020 +0200

Re-use roles and groups defined on users on MemoryUserDatabase creation

When the XML file for MemoryUserDatabse is digested, the order of the
elements was important. It had to be roles, groups and than users.
With this patch the order of the elements is not important anymore.
If a user element defined a role or group before the corresponding
role or group element, we now will re-use that element and add a
possibly missing description.

Bugzilla Id: 64442
---
 conf/tomcat-users.xsd | 12 ++--
 .../org/apache/catalina/users/MemoryUserDatabase.java | 19 ---
 webapps/docs/changelog.xml|  4 
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/conf/tomcat-users.xsd b/conf/tomcat-users.xsd
index 948bd01..6a3446c 100644
--- a/conf/tomcat-users.xsd
+++ b/conf/tomcat-users.xsd
@@ -24,21 +24,21 @@
version="1.0">
   
 
-  
-
+  
+
   
 
 
   
 
-
+
   
 
 
 
   
 
-
+
   
 
 
@@ -47,7 +47,7 @@
 
   
 
-  
+  
   
 
   
@@ -56,4 +56,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java 
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 7c81f11..6062c75 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -736,7 +736,14 @@ class MemoryGroupCreationFactory extends 
AbstractObjectCreationFactory {
 }
 String description = attributes.getValue("description");
 String roles = attributes.getValue("roles");
-Group group = database.createGroup(groupname, description);
+Group group = database.findGroup(groupname);
+if (group == null) {
+group = database.createGroup(groupname, description);
+} else {
+if (group.getDescription() == null) {
+group.setDescription(description);
+}
+}
 if (roles != null) {
 while (roles.length() > 0) {
 String rolename = null;
@@ -781,8 +788,14 @@ class MemoryRoleCreationFactory extends 
AbstractObjectCreationFactory {
 rolename = attributes.getValue("name");
 }
 String description = attributes.getValue("description");
-Role role = database.createRole(rolename, description);
-return role;
+Role existingRole = database.findRole(rolename);
+if (existingRole == null) {
+return database.createRole(rolename, description);
+}
+if (existingRole.getDescription() == null) {
+existingRole.setDescription(description);
+}
+return existingRole;
 }
 
 private final MemoryUserDatabase database;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1dc0083..a5e3266 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,10 @@
 Implement a few rewrite SSL env that correspond to Servlet request
 attributes. (remm)
   
+  
+64442Be more flexible with respect to the ordering of 
groups,
+roles and users in the tomcat-users.xml file. 
(fschumacher)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Re-use roles and groups defined on users on MemoryUserDatabase creation

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 d64df9a  Re-use roles and groups defined on users on 
MemoryUserDatabase creation
d64df9a is described below

commit d64df9ae24c1fd038de9a15609993114bb3700eb
Author: Felix Schumacher 
AuthorDate: Thu May 14 20:19:18 2020 +0200

Re-use roles and groups defined on users on MemoryUserDatabase creation

When the XML file for MemoryUserDatabse is digested, the order of the
elements was important. It had to be roles, groups and than users.
With this patch the order of the elements is not important anymore.
If a user element defined a role or group before the corresponding
role or group element, we now will re-use that element and add a
possibly missing description.

Bugzilla Id: 64442
---
 conf/tomcat-users.xsd | 12 ++--
 .../org/apache/catalina/users/MemoryUserDatabase.java | 19 ---
 webapps/docs/changelog.xml|  4 
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/conf/tomcat-users.xsd b/conf/tomcat-users.xsd
index 948bd01..6a3446c 100644
--- a/conf/tomcat-users.xsd
+++ b/conf/tomcat-users.xsd
@@ -24,21 +24,21 @@
version="1.0">
   
 
-  
-
+  
+
   
 
 
   
 
-
+
   
 
 
 
   
 
-
+
   
 
 
@@ -47,7 +47,7 @@
 
   
 
-  
+  
   
 
   
@@ -56,4 +56,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java 
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 7c81f11..6062c75 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -736,7 +736,14 @@ class MemoryGroupCreationFactory extends 
AbstractObjectCreationFactory {
 }
 String description = attributes.getValue("description");
 String roles = attributes.getValue("roles");
-Group group = database.createGroup(groupname, description);
+Group group = database.findGroup(groupname);
+if (group == null) {
+group = database.createGroup(groupname, description);
+} else {
+if (group.getDescription() == null) {
+group.setDescription(description);
+}
+}
 if (roles != null) {
 while (roles.length() > 0) {
 String rolename = null;
@@ -781,8 +788,14 @@ class MemoryRoleCreationFactory extends 
AbstractObjectCreationFactory {
 rolename = attributes.getValue("name");
 }
 String description = attributes.getValue("description");
-Role role = database.createRole(rolename, description);
-return role;
+Role existingRole = database.findRole(rolename);
+if (existingRole == null) {
+return database.createRole(rolename, description);
+}
+if (existingRole.getDescription() == null) {
+existingRole.setDescription(description);
+}
+return existingRole;
 }
 
 private final MemoryUserDatabase database;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 69494eb..eb3c72d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,10 @@
 Implement a few rewrite SSL env that correspond to Servlet request
 attributes. (remm)
   
+  
+64442Be more flexible with respect to the ordering of 
groups,
+roles and users in the tomcat-users.xml file. 
(fschumacher)
+  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1874523 - /tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

[fschumacher]

Author: fschumacher
Date: Tue Feb 25 19:27:27 2020
New Revision: 1874523

URL: http://svn.apache.org/viewvc?rev=1874523=rev
Log:
Substring starts on index 1

Take Konstantins note into account and let the xpath function substring start
with the correct index of "1". Now we can use a shorter substring, to get the
same results, so use 9 instead of 8 for the length.

Modified:
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1874523=1874522=1874523=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Feb 25 19:27:27 2020
@@ -359,7 +359,7 @@
   
   
   
-  
+  
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1874502 - in /tomcat/site/trunk: docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml xdocs/stylesheets/tomcat-sit

[fschumacher]

Author: fschumacher
Date: Tue Feb 25 15:46:38 2020
New Revision: 1874502

URL: http://svn.apache.org/viewvc?rev=1874502=rev
Log:
Use full hash for git links

and shorten the text of the link on the fly while generating the docs with xslt.

The reconstruction of the long hashes were done with the following 
shell/perl/sed constructs:

sed -e "$(perl -M5.020 -ne 'say $1 if /hashlink hash="(\w+)"/' 
../tomcat-site-trunk/xdocs/security-7.xml \
| while read i
do git log  --pretty="s/\\b$i\\b/%H/g;" -l 1 $i^1..$i | cat
done)" -i ../tomcat-site-trunk/xdocs/security-7.xml
sed -i -e 's/\(hashlink hash="\w*"\)>\w*<\/hashlink/\1\//' 
../tomcat-site-trunk/xdocs/security-7.xml

That was done for the three security files for tomcat 7, 8 and 9.

Modified:
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-7.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-9.xml
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1874502=1874501=1874502=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Tue Feb 25 15:46:38 2020
@@ -82,10 +82,10 @@
will need to make small changes to their configurations as a result.
 
 This was fixed with commits
-   https://github.com/apache/tomcat/commit/0d633e7;>0d633e7,
-   https://github.com/apache/tomcat/commit/40d5d93;>40d5d93,
-   https://github.com/apache/tomcat/commit/b99fba5;>b99fba5 
and
-   https://github.com/apache/tomcat/commit/f7180ba;>f7180ba.
+   https://github.com/apache/tomcat/commit/0d633e72ebc7b3c242d0081c23bba5e4dacd9b72;>0d633e72,
+   https://github.com/apache/tomcat/commit/40d5d93bd284033cf4a1f77f5492444f83d803e2;>40d5d93b,
+   https://github.com/apache/tomcat/commit/b99fba5bd796d876ea536e83299603443842feba;>b99fba5b
 and
+   https://github.com/apache/tomcat/commit/f7180bafc74cb1250c9e9287b68a230f0e1f4645;>f7180baf.
 
 This issue was reported to the Apache Tomcat Security Team on 3 January
2020. The issue was made public on 24 February 2020.
@@ -103,7 +103,7 @@
 considered unlikely.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/702bf15;>702bf15.
+   https://github.com/apache/tomcat/commit/702bf15bea292915684d931526d95d4990b2e73d;>702bf15b.
 
 This issue was reported to the Apache Tomcat Security Team by @ZeddYu
on 25 December 2019. The issue was made public on 24
@@ -122,7 +122,7 @@
 considered unlikely.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/b191a0d;>b191a0d.
+   https://github.com/apache/tomcat/commit/b191a0d9cf06f4e04257c221bfe41d2b108a9cc8;>b191a0d9.
 
 This issue was reported to the Apache Tomcat Security Team by @ZeddYu
on 12 December 2019. The issue was made public on 24
@@ -142,7 +142,7 @@
vulnerability.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/ab72a10;>ab72a10.
+   https://github.com/apache/tomcat/commit/ab72a106fe5d992abddda954e30849d7cf8cc583;>ab72a106.
 
 This issue was reported to the Apache Tomcat Security Team by William
Marlow (IBM) on 19 November 2019. The issue was made public on 18
@@ -172,7 +172,7 @@
vulnerability that enables this issue to be exploited remotely.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/bef3f40;>bef3f40.
+   https://github.com/apache/tomcat/commit/bef3f40400243348d12f4abfe9b413f43897c02b;>bef3f404.
 
 This issue was reported to the Apache Tomcat Security Team by An Trinh 
of
Viettel Cyber Security on 10 October 2019. The issue was made public on 
18
@@ -195,7 +195,7 @@
blog.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/7f0221b;>7f0221b.
+   https://github.com/apache/tomcat/commit/7f0221b904956359f2d739aa3a2b53f8c12ed8c7;>7f0221b9.
 
 This issue was identified by Nightwatch Cybersecurity Research and
reported to the Apache Tomcat security team via the bug bounty program
@@ -213,7 +213,7 @@
in a production website.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/44ec74c;>44ec74c.
+   https://github.com/apache/tomcat/commit/44ec74c44dcd05cd7e90967c04d40b51440ecd7e;>44ec74c4.
 
 This issue was identified by Nightwatch Cybersecurity Research and
reported to the Apache Tomcat security team via the bug bounty program

Modified: tomcat/site/trunk/docs/security-8.html

[tomcat] branch 8.5.x updated: Ensure new line for build properties in travis

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 bd95665  Ensure new line for build properties in travis
bd95665 is described below

commit bd956652f7e9da305cc59c9f8b8712432a3de394
Author: Felix Schumacher 
AuthorDate: Fri Feb 21 18:12:33 2020 +0100

Ensure new line for build properties in travis
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 526a1ea..24f07da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,7 @@ install:
 - make install
 - cd $CURR_PWD
 - yes | cp build.properties.default build.properties
+- echo >> build.properties
 - echo "test.threads=16" >> build.properties
 - echo "test.relaxTiming=true" >> build.properties
 - echo "test.excludePerformance=true" >> build.properties


-
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: Ensure new line for build properties in travis

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 ae78caf  Ensure new line for build properties in travis
ae78caf is described below

commit ae78caf8342cf096610f2f732e651ef75fdd170a
Author: Felix Schumacher 
AuthorDate: Fri Feb 21 18:12:33 2020 +0100

Ensure new line for build properties in travis
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 526a1ea..24f07da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,7 @@ install:
 - make install
 - cd $CURR_PWD
 - yes | cp build.properties.default build.properties
+- echo >> build.properties
 - echo "test.threads=16" >> build.properties
 - echo "test.relaxTiming=true" >> build.properties
 - echo "test.excludePerformance=true" >> build.properties


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Ensure new line for build properties in travis

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 7d62157  Ensure new line for build properties in travis
7d62157 is described below

commit 7d62157c902d3ba355c99790d65c5b940f92edad
Author: Felix Schumacher 
AuthorDate: Fri Feb 21 18:12:33 2020 +0100

Ensure new line for build properties in travis
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 526a1ea..24f07da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,7 @@ install:
 - make install
 - cd $CURR_PWD
 - yes | cp build.properties.default build.properties
+- echo >> build.properties
 - echo "test.threads=16" >> build.properties
 - echo "test.relaxTiming=true" >> build.properties
 - echo "test.excludePerformance=true" >> build.properties


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] 01/02: Markup changes

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 85d6dec49a8b00fa39c552fbd6ab325cdc5de31d
Author: Felix Schumacher 
AuthorDate: Sun Feb 9 15:19:51 2020 +0100

Markup changes
---
 README.md | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f6717e..637c529 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,13 @@ The source should be a path to a compressed archive, a 
folder or an individual f
 Jakarta EE 9 is still under development and there are some details that remain 
to be worked out.
 
 The differences currently supported by this tool are:
-* Renaming packages for Jakarta EE 9 APIs from javax.* to jakarta.*
+
+* Renaming packages for Jakarta EE 9 APIs from `javax.*` to `jakarta.*`
 
 The differences yet to be implemented by this tool are:
+
 * Remaining issues once resolved
 
 The issues still to be resolved by the Jakarta EE projects that will impact 
this tool are:
+
 * XML schemas


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated (8207a5d -> 1418dfd)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.


from 8207a5d  Simplify code
 new 85d6dec  Markup changes
 new 1418dfd  Add warnings in the log for each removed signature

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:
 README.md  | 10 +-
 src/main/java/org/apache/tomcat/jakartaee/Migration.java   | 10 +++---
 .../org/apache/tomcat/jakartaee/LocalStrings.properties|  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] 02/02: Add warnings in the log for each removed signature

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 1418dfd906bb4bbe405a1ce835617231e8ac1177
Author: Felix Schumacher 
AuthorDate: Sun Feb 9 15:19:15 2020 +0100

Add warnings in the log for each removed signature
---
 README.md  |  5 +
 src/main/java/org/apache/tomcat/jakartaee/Migration.java   | 10 +++---
 .../org/apache/tomcat/jakartaee/LocalStrings.properties|  3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 637c529..990718e 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,11 @@ Migrate your Servlet application with:
 
 The source should be a path to a compressed archive, a folder or an individual 
file. The destination will be created at the specified path as a resource of 
the same type as the source.
 
+> **INFO**
+> This tool will remove cryptographic signatures from JAR files contained in 
the *source*, as the changed resources would not match them anymore.
+>
+> A warning will be logged for each JAR file where the signature has been 
removed.
+
 ## Differences between Java EE 8 and Jakarta EE 9
 
 Jakarta EE 9 is still under development and there are some details that remain 
to be worked out.
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index f2eed3f..1140f26 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -139,7 +139,9 @@ public class Migration {
 // Otherwise messing with signatures will fail
 manifest = new Manifest(manifest);
 updateVersion(manifest);
-removeSignatures(manifest);
+if (removeSignatures(manifest)) {
+logger.log(Level.WARNING, 
sm.getString("migration.warnSignatureRemoval"));
+}
 JarEntry manifestEntry = new JarEntry(JarFile.MANIFEST_NAME);
 jarOs.putNextEntry(manifestEntry);
 manifest.write(jarOs);
@@ -185,8 +187,8 @@ public class Migration {
 }
 
 
-private void removeSignatures(Manifest manifest) {
-manifest.getMainAttributes().remove(Attributes.Name.SIGNATURE_VERSION);
+private boolean removeSignatures(Manifest manifest) {
+boolean removedSignatures = 
manifest.getMainAttributes().remove(Attributes.Name.SIGNATURE_VERSION) != null;
 List signatureEntries = new ArrayList<>();
 Map manifestAttributeEntries = 
manifest.getEntries();
 for (Entry entry : 
manifestAttributeEntries.entrySet()) {
@@ -194,10 +196,12 @@ public class Migration {
 String entryName = entry.getKey();
 signatureEntries.add(entryName);
 logger.log(Level.FINE, 
sm.getString("migration.removeSignature", entryName));
+removedSignatures = true;
 }
 }
 signatureEntries.stream()
 .forEach(manifestAttributeEntries::remove);
+return removedSignatures;
 }
 
 
diff --git 
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties 
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index 2f9560d..d13091f 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -23,4 +23,5 @@ migration.mkdirError=Error creating destination directory 
[{0}]
 migration.removeSignature=Remove cryptographic signature for [{0}]
 migration.skipSignatureFile=Drop cryptographic signature file [{0}]
 migration.stream=Migrating stream [{0}]
-migration.usage=Usage: Migration  
\ No newline at end of file
+migration.usage=Usage: Migration  
+migration.warnSignatureRemoval=Removed cryptographic signature from JAR file
\ No newline at end of file


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated: Simplify code

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 8207a5d  Simplify code
8207a5d is described below

commit 8207a5d74e2b22f0d5e2e58dd37ee3d9ae9bd74e
Author: Felix Schumacher 
AuthorDate: Sun Feb 9 12:12:15 2020 +0100

Simplify code

No need for if clause. The return values are the result of the 
if-expression.
With the last commit, we are sure that we don't get null values, so we 
don't have
to guard or code against it.
---
 src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 10 +-
 src/main/java/org/apache/tomcat/jakartaee/TextConverter.java  |  9 +
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 303b066..4bb 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -30,15 +30,7 @@ public class ClassConverter implements Converter {
 @Override
 public boolean accepts(String filename) {
 String extension = Util.getExtension(filename);
-if (extension == null || extension.length() == 0) {
-return false;
-}
-
-if ("class".equals(extension)) {
-return true;
-}
-
-return false;
+return "class".equals(extension);
 }
 
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
index 7cf2530..d0a0db2 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
@@ -45,15 +45,8 @@ public class TextConverter implements Converter {
 @Override
 public boolean accepts(String filename) {
 String extension = Util.getExtension(filename);
-if (extension == null || extension.length() == 0) {
-return false;
-}
-
-if (supportedExtensions.contains(extension)) {
-return true;
-}
 
-return false;
+return supportedExtensions.contains(extension);
 }
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated: Don't return null on empty extensions

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 86b8370  Don't return null on empty extensions
86b8370 is described below

commit 86b8370a714167d86c3fe72be721331658586862
Author: Felix Schumacher 
AuthorDate: Sun Feb 9 12:09:46 2020 +0100

Don't return null on empty extensions

Make it easier for the consumer to handle our answers.
---
 src/main/java/org/apache/tomcat/jakartaee/Util.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Util.java 
b/src/main/java/org/apache/tomcat/jakartaee/Util.java
index 25f063f..21e0fbf 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Util.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Util.java
@@ -25,11 +25,18 @@ public class Util {
 private static Pattern PATTERN = Pattern.compile(
 
"javax([/\\.](annotation|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction|websocket))");
 
+/**
+ * Get the extension of a filename
+ * 
+ * The extension is the string after the last '{@code .}' in the filename.
+ * @param filename the name of the file
+ * @return the extension or an empty string, if no dot is found in the 
filename
+ */
 public static String getExtension(String filename) {
 // Extract the extension
 int lastPeriod = filename.lastIndexOf('.');
 if (lastPeriod == -1) {
-return null;
+return "";
 }
 return filename.substring(lastPeriod + 1).toLowerCase(Locale.ENGLISH);
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated: Use char instead of single char string

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new d5e2d09  Use char instead of single char string
d5e2d09 is described below

commit d5e2d090c0b6152ef6d245817e390a46913b6d79
Author: Felix Schumacher 
AuthorDate: Sun Feb 9 12:03:41 2020 +0100

Use char instead of single char string

The version of String#indexOf is faster for char.
---
 src/main/java/org/apache/tomcat/jakartaee/Util.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Util.java 
b/src/main/java/org/apache/tomcat/jakartaee/Util.java
index 6834ad8..25f063f 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Util.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Util.java
@@ -27,7 +27,7 @@ public class Util {
 
 public static String getExtension(String filename) {
 // Extract the extension
-int lastPeriod = filename.lastIndexOf(".");
+int lastPeriod = filename.lastIndexOf('.');
 if (lastPeriod == -1) {
 return null;
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch master updated: Drop cryptographic signatures from converted JAR files

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new b379249  Drop cryptographic signatures from converted JAR files
b379249 is described below

commit b379249200d71272fa5a726181f9a979321dd73c
Author: Felix Schumacher 
AuthorDate: Sun Feb 9 11:55:38 2020 +0100

Drop cryptographic signatures from converted JAR files

When we change the classes in the JAR files, the cryptographic
signatures will no longer be valid. Deployment of WAR files that
contain those JAR files will fail.

Therefore drop the signatures of any JAR file that is contained
in the WAR.

All dropped signatures and signature files will be logged at leve FINE.
Maybe we should log a warning at the end of the conversion, if signatures
where dropped, to raise more awareness for these kind of modification.
---
 .../org/apache/tomcat/jakartaee/Migration.java | 42 ++
 .../tomcat/jakartaee/LocalStrings.properties   |  2 ++
 2 files changed, 44 insertions(+)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 04e073a..f2eed3f 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -24,6 +24,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
@@ -133,7 +135,11 @@ public class Migration {
 JarOutputStream jarOs = new JarOutputStream(new 
NonClosingOutputStream(dest))) {
 Manifest manifest = jarIs.getManifest();
 if (manifest != null) {
+// Make a safe copy to leave original manifest untouched.
+// Otherwise messing with signatures will fail
+manifest = new Manifest(manifest);
 updateVersion(manifest);
+removeSignatures(manifest);
 JarEntry manifestEntry = new JarEntry(JarFile.MANIFEST_NAME);
 jarOs.putNextEntry(manifestEntry);
 manifest.write(jarOs);
@@ -142,6 +148,10 @@ public class Migration {
 while ((jarEntry = jarIs.getNextJarEntry()) != null) {
 String sourceName = jarEntry.getName();
 logger.log(Level.FINE, sm.getString("migration.entry", 
sourceName));
+if (isSignatureFile(sourceName)) {
+logger.log(Level.FINE, 
sm.getString("migration.skipSignatureFile", sourceName));
+continue;
+}
 String destName = Util.convert(sourceName);
 JarEntry destEntry = new JarEntry(destName);
 jarOs.putNextEntry(destEntry);
@@ -152,6 +162,12 @@ public class Migration {
 }
 
 
+private boolean isSignatureFile(String sourceName) {
+return sourceName.startsWith("META-INF/")
+&& (sourceName.endsWith(".SF") || sourceName.endsWith(".RSA") 
|| sourceName.endsWith(".DSA"));
+}
+
+
 private boolean migrateStream(String name, InputStream src, OutputStream 
dest) throws IOException {
 if (isArchive(name)) {
 logger.log(Level.INFO, sm.getString("migration.archive", name));
@@ -169,6 +185,32 @@ public class Migration {
 }
 
 
+private void removeSignatures(Manifest manifest) {
+manifest.getMainAttributes().remove(Attributes.Name.SIGNATURE_VERSION);
+List signatureEntries = new ArrayList<>();
+Map manifestAttributeEntries = 
manifest.getEntries();
+for (Entry entry : 
manifestAttributeEntries.entrySet()) {
+if (isCryptoSignatureEntry(entry.getValue())) {
+String entryName = entry.getKey();
+signatureEntries.add(entryName);
+logger.log(Level.FINE, 
sm.getString("migration.removeSignature", entryName));
+}
+}
+signatureEntries.stream()
+.forEach(manifestAttributeEntries::remove);
+}
+
+
+private boolean isCryptoSignatureEntry(Attributes attributes) {
+for (Object attributeKey : attributes.keySet()) {
+if (attributeKey.toString().endsWith("-Digest")) {
+return true;
+}
+}
+return false;
+}
+
+
 private void updateVersion(Manifest manifest) {
 updateVersion(manifest.getMainAttributes());
 for (Attributes attributes : manifest.getEntries().values()) {
diff --git 
a/src/main/resourc

[tomcat-jakartaee-migration] branch master updated: Correct typo in interface

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new f447383  Correct typo in interface
f447383 is described below

commit f447383746d96c743b1b6fce38f6369d9838c6f9
Author: Felix Schumacher 
AuthorDate: Thu Jan 30 18:56:47 2020 +0100

Correct typo in interface

Although this is a breaking change of a public API, I think
the impact will be rather low, as the project is still very
young.
---
 src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 2 +-
 src/main/java/org/apache/tomcat/jakartaee/Converter.java  | 2 +-
 src/main/java/org/apache/tomcat/jakartaee/Migration.java  | 2 +-
 src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java  | 2 +-
 src/main/java/org/apache/tomcat/jakartaee/TextConverter.java  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 01957af..303b066 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -28,7 +28,7 @@ import org.apache.bcel.classfile.JavaClass;
 public class ClassConverter implements Converter {
 
 @Override
-public boolean accpets(String filename) {
+public boolean accepts(String filename) {
 String extension = Util.getExtension(filename);
 if (extension == null || extension.length() == 0) {
 return false;
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Converter.java 
b/src/main/java/org/apache/tomcat/jakartaee/Converter.java
index e569636..f3d62ec 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Converter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Converter.java
@@ -22,7 +22,7 @@ import java.io.OutputStream;
 
 public interface Converter {
 
-boolean accpets(String filename);
+boolean accepts(String filename);
 
 void convert(InputStream src, OutputStream dest) throws IOException;
 }
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 64f68d5..9870a82 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -159,7 +159,7 @@ public class Migration {
 } else {
 logger.log(Level.FINE, sm.getString("migration.stream", name));
 for (Converter converter : converters) {
-if (converter.accpets(name)) {
+if (converter.accepts(name)) {
 converter.convert(src, dest);
 break;
 }
diff --git a/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java
index 2d918a0..cd1152a 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java
@@ -23,7 +23,7 @@ import java.io.OutputStream;
 public class NoOpConverter implements Converter {
 
 @Override
-public boolean accpets(String filename) {
+public boolean accepts(String filename) {
 // Accepts everything
 return true;
 }
diff --git a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
index bec3e7e..7cf2530 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
@@ -43,7 +43,7 @@ public class TextConverter implements Converter {
 
 
 @Override
-public boolean accpets(String filename) {
+public boolean accepts(String filename) {
 String extension = Util.getExtension(filename);
 if (extension == null || extension.length() == 0) {
 return false;


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Allow more quoted tokens for RewriteValve config

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 b978b2c  Allow more quoted tokens for RewriteValve config
b978b2c is described below

commit b978b2c83ffe1be0670f47ccab0cbfaebdaba694
Author: Felix Schumacher 
AuthorDate: Fri Nov 1 16:52:52 2019 +0100

Allow more quoted tokens for RewriteValve config

Along with quoted token parsing, RewriteMaps can have more than one
parameter now.

Bugzilla Id: 64067
Part of #221
---
 .../valves/rewrite/QuotedStringTokenizer.java  | 135 +
 .../apache/catalina/valves/rewrite/RewriteMap.java |  18 +++
 .../catalina/valves/rewrite/RewriteValve.java  |   2 +-
 .../valves/rewrite/TestQuotedStringTokenizer.java  |  71 +++
 webapps/docs/changelog.xml |   4 +
 webapps/docs/rewrite.xml   |   6 +-
 6 files changed, 234 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java 
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
new file mode 100644
index 000..101dd96
--- /dev/null
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves.rewrite;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+public class QuotedStringTokenizer {
+
+private Iterator tokenIterator;
+private int tokenCount;
+private int returnedTokens = 0;
+
+enum WordMode {
+SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+}
+
+public QuotedStringTokenizer(String text) {
+List tokens;
+if (text != null) {
+tokens = tokenizeText(text);
+} else {
+tokens = Collections.emptyList();
+}
+this.tokenCount = tokens.size();
+this.tokenIterator = tokens.iterator();
+}
+
+private List tokenizeText(String inputText) {
+List tokens = new ArrayList<>();
+int pos = 0;
+int length = inputText.length();
+WordMode currentMode = WordMode.SPACES;
+StringBuilder currentToken = new StringBuilder();
+while (pos < length) {
+char currentChar = inputText.charAt(pos);
+switch (currentMode) {
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken, currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken, currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new IllegalStateException(
+"Couldn't tokenize text " + inputText + " after 
position " + pos + "from mode " + currentMode);
+}
+pos++;
+}
+String possibleLastToken = currentToken.toString();
+if (!possibleLastToken.isEmpty()) {
+tokens.add(possibleLastToken);
+}
+return tokens;
+}
+
+private WordMode handleSimple(List tokens, StringBuilder 
currentToken, char currentChar) {
+if (Character.isWhitespace(currentChar)) {
+tokens.add(currentToken.toString());
+currentToken.setLength(0);
+return WordMode.SPACES;
+} else {
+currentToken.append(currentChar);
+}
+return WordMode.SIMPLE;
+}
+
+private WordMode handleQuoted(List tokens, StringBuilder 

svn commit: r1869240 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

[fschumacher]

Author: fschumacher
Date: Fri Nov  1 10:14:59 2019
New Revision: 1869240

URL: http://svn.apache.org/viewvc?rev=1869240=rev
Log:
Added presentations from ApacheCon Europe 2019

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1869240=1869239=1869240=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Fri Nov  1 10:14:59 2019
@@ -1,268 +1,265 @@
 
 
-
-
-
-
-
-Apache Tomcat - Presentations
-
-
-
-
-
-
-
-
-http://tomcat.apache.org/;>
-
-Apache Tomcat
-
-
-https://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">
-
-
-
-
-
-
-
-https://www.google.com/search; 
method="get">
-
-GO
-
-
-
-https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
-
-  Save the date!
+
+
+
+
+
+Apache Tomcat - Presentations
+
+
+
+
+
+
+
+
+http://tomcat.apache.org/;>
+Apache Tomcat
+
+
+https://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">
+
+
+
+
+
+
+
+https://www.google.com/search; method="get">
+
+GO
+
+
+
+https://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
+  Save the date!
 
-
-
-
-Apache Tomcat
-
-
-Home
-
-
-Taglibs
-
-
-Maven Plugin
-
-
-
-
-Download
-
-
-Which version?
-
-
-https://tomcat.apache.org/download-90.cgi;>Tomcat 9
-
-
-https://tomcat.apache.org/download-80.cgi;>Tomcat 8
-
-
-https://tomcat.apache.org/download-70.cgi;>Tomcat 7
-
-
-https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors
-
-
-https://tomcat.apache.org/download-native.cgi;>Tomcat Native
-
-
-https://tomcat.apache.org/download-taglibs.cgi;>Taglibs
-
-
-https://archive.apache.org/d

[tomcat] branch master updated: Add javadoc for RewriteMap

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 3f9d9de  Add javadoc for RewriteMap
3f9d9de is described below

commit 3f9d9de8568d22e5614491af0ef731dbde38107c
Author: Felix Schumacher 
AuthorDate: Sat Oct 26 12:24:03 2019 +0200

Add javadoc for RewriteMap
---
 .../apache/catalina/valves/rewrite/RewriteMap.java | 33 ++
 1 file changed, 33 insertions(+)

diff --git a/java/org/apache/catalina/valves/rewrite/RewriteMap.java 
b/java/org/apache/catalina/valves/rewrite/RewriteMap.java
index 428588c..551584b 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteMap.java
@@ -16,9 +16,42 @@
  */
 package org.apache.catalina.valves.rewrite;
 
+/**
+ * Interface for user defined lookup/replacement logic that can be defined in
+ * a {@code rewrite.config} file by a {@code RewriteMap} directive. Such a map
+ * can then be used by a {@code RewriteRule} defined in the same file.
+ * 
+ * An example {@code rewrite.config} file could look like:
+ * 
+ * 
+ * RewriteMap uc example.UpperCaseMap
+ *
+ * RewriteRule ^/(.*)$ ${uc:$1}
+ * 
+ * 
+ *
+ * One parameter can be optionally appended to the {@code RewriteMap} 
directive.
+ * This could be used  for example  to specify a name of a file, 
that
+ * contains a lookup table used by the implementation of the map.
+ */
 public interface RewriteMap {
 
+/**
+ * Optional parameter that can be defined through the {@code RewriteMap}
+ * directive in the {@code rewrite.config} file.
+ *
+ * @param params the optional parameter
+ * @return value is currently ignored
+ */
 public String setParameters(String params);
 
+/**
+ * Maps a key to a replacement value.
+ * The method is free to return {@code null} to indicate, that the default
+ * value from the {@code RewriteRule} directive should be used.
+ *
+ * @param key used by the actual implementation to generate a mapped value
+ * @return mapped value or {@code null}
+ */
 public String lookup(String key);
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/03: Add more documentation about usage of RewriteMap

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e70ef8567bbe4b852ecfff41add0c43ba36d7fa6
Author: Felix Schumacher 
AuthorDate: Fri Oct 25 15:38:10 2019 +0200

Add more documentation about usage of RewriteMap

Add a more detailed example by providing a sample implementation
and a hopefully more clear example rewrite.config.
---
 webapps/docs/changelog.xml |  4 
 webapps/docs/rewrite.xml   | 47 ++
 2 files changed, 51 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb9e74d..87e5d44 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,10 @@
 63832: Properly mark container as FAILED when a JVM error
 occurs on stop. (remm)
   
+  
+Add more details on the usage of RewriteMap
+functionality in the RewriteValve. (fschumacher)
+  
 
   
   
diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index 142680c..82b0b77 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -17,6 +17,7 @@
 -->
 
+  
 ]>
 
 
@@ -404,6 +405,52 @@ public interface RewriteMap {
 public String lookup(String key);
 }]]>
 
+The referenced implementation of such a class  in our example 
rewriteMapClassName 
+will be instantiated and initialized with the optional parameter  
optionalParameters from above
+(be careful with whitespace)  by calling 
setParameters(String). That instance
+will then be registered under the name given as the first paramter of 
RewriteMap rule.
+
+That instance will be given the the lookup value that is configured in 
the corresponding RewriteRule by
+calling lookup(String). Your implementation is free to return 
null to indicate,
+that the given default should be used, or to return a replacement 
value.
+
+Say, you want to implement a rewrite map function that converts all 
lookup keys to uppercase. You
+would start by implementing a class that implements the 
RewriteMap interface.
+
+
+
+Compile this class, put it into a jar and place that jar in 
${CATALINA_BASE}/lib.
+
+Having done that, you can now define a map with the 
RewriteMap directive
+and further on use that map in a RewriteRule.
+
+RewriteMap uc example.maps.UpperCaseMap
+
+RewriteRule ^/(.*)$ ${uc:$1}
+
+
+With this setup a request to the url path /index.html 
would get routed
+to /INDEX.HTML.
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (071d63e -> e70ef85)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 071d63e  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63831
 new 70b54a9  Small typo in changelog
 new 63ea6ad  Correct link target for RewriteMap in documentation
 new e70ef85  Add more documentation about usage of RewriteMap

The 3 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:
 webapps/docs/changelog.xml |  6 +-
 webapps/docs/rewrite.xml   | 51 --
 2 files changed, 54 insertions(+), 3 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/03: Small typo in changelog

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 70b54a99e8e366e1b178a7814c3b20ab36fd4195
Author: Felix Schumacher 
AuthorDate: Fri Oct 25 15:42:36 2019 +0200

Small typo in changelog
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 49e2d01..eb9e74d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -325,7 +325,7 @@
   
   
 63733: Remove the documentation for the Additional
-Components since they have been remove / merged into the core
+Components since they have been removed / merged into the core
 Tomcat distribution for 9.0.5 onwards. (markt)
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Correct link target for RewriteMap in documentation

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 63ea6ad6e3490c34d8915090f7e312fafbd5148f
Author: Felix Schumacher 
AuthorDate: Fri Oct 25 13:00:34 2019 +0200

Correct link target for RewriteMap in documentation
---
 webapps/docs/rewrite.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index 0b810bf..142680c 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -98,7 +98,7 @@
   RewriteMap expansions: These are
   expansions of the form ${mapname:key|default}.
-  See the documentation for
+  See the documentation for
   RewriteMap for more details.
 
 
@@ -509,7 +509,7 @@ cannot use $N in the substitution string!
 server-variables as in rule condition test-strings
 (%{VARNAME})
 
-mapping-function calls
+mapping-function calls
 (${mapname:key|default})
   
   Back-references are identifiers of the form


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Correct wording (typo)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 b5bc652  Correct wording (typo)
b5bc652 is described below

commit b5bc652379f8a43b092f2b0ff91cb94bc9a88ac7
Author: Felix Schumacher 
AuthorDate: Tue Sep 17 13:26:41 2019 +0200

Correct wording (typo)
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 58ea4f9..d8fddc4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -84,7 +84,7 @@ Download Page. There is one such page for every major Tomcat 
version:
 
 If you have chosen to attach a patch to the Bugzilla issue (or email
 one), then you'll need to download the sources as noted above, make your
-desired changes and then manually generate your patch using diff (other
+desired changes and then manually generate your patch using diff (or any
 other tool).
 
 # GitHub


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Use single quotes instead of custom build double quotes

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 c4285fb  Use single quotes instead of custom build double quotes
c4285fb is described below

commit c4285fb7635f5b54bec3c953749007377d12f95d
Author: Felix Schumacher 
AuthorDate: Tue Sep 17 12:36:16 2019 +0200

Use single quotes instead of custom build double quotes
---
 webapps/docs/rewrite.xml | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index 4e2160e..af656ab 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -254,7 +254,7 @@
 value of a header sent in the HTTP request.
 Example: %{HTTP:Proxy-Connection} is
 the value of the HTTP header
-``Proxy-Connection:''.
+'Proxy-Connection:'.
 
   
 
@@ -366,7 +366,7 @@ RewriteRule ...some special stuff for any of these 
hosts...
   Example:
 
To rewrite the Homepage of a site according to the
-``User-Agent:'' header of the request, you can
+'User-Agent:' header of the request, you can
 use the following: 
 
 RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla.*
@@ -418,7 +418,7 @@ public interface RewriteMap {
 
   Pattern is a perl compatible regular
   expression, which is applied to the current URL.
-  ``Current'' means the value of the URL when this rule is
+  'Current' means the value of the URL when this rule is
   applied. This may not be the originally requested URL,
   which may already have matched a previous rule, and have been
   altered.
@@ -440,8 +440,8 @@ public interface RewriteMap {
 
 Text:
   .   Any single character
-  [chars] 
Character class: Any character of the class ``chars''
-  [^chars]
Character class: Not a character of the class ``chars''
+  [chars] 
Character class: Any character of the class 'chars'
+  [^chars]
Character class: Not a character of the class 'chars'
   text1|text2 Alternative: text1 or text2
 
 Quantifiers:
@@ -481,8 +481,8 @@ public interface RewriteMap {
   In the rules, the NOT character
('!') is also available as a possible pattern
   prefix. This enables you to negate a pattern; to say, for instance:
-  ``if the current URL does NOT match this
-  pattern''. This can be used for exceptional cases, where
+  'if the current URL does NOT match this
+  pattern'. This can be used for exceptional cases, where
   it is easier to match the negative pattern, or as a last
   default rule.
 
@@ -565,9 +565,9 @@ cannot use $N in the substitution string!
 the flag has no effect. If the rule does
 not match, then all following chained
 rules are skipped. For instance, it can be used to remove the
-``.www'' part, inside a per-directory rule set,
+'.www' part, inside a per-directory rule set,
 when you let an external redirect happen (where the
-``.www'' part should not occur!).
+'.www' part should not occur!).
 
 
 
'cookie|CO=NAME:VAL:domain[:lifetime[:path]]'
@@ -698,8 +698,8 @@ cannot use $N in the substitution string!
   temp (default), permanent,
   seeother. Use this for rules to
   canonicalize the URL and return it to the client - to
-  translate ``/~'' into
-  ``/u/'', or to always append a slash to
+  translate '/~' into
+  '/u/', or to always append a slash to
   /u/user, etc.
   Note: When you use this flag, make
   sure that the substitution field is a valid URL! Otherwise,


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: fix JSSE_OPTS quoting

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a486b9e02a0bee2b0c87ee2b5551a82f25cbcf29
Author: Peter Uhnak 
AuthorDate: Mon Aug 26 11:31:43 2019 +0200

fix JSSE_OPTS quoting

Part of #196 on github
---
 bin/catalina.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index cd08425..239e81c 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -206,7 +206,7 @@ set 
"CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"
 :juliClasspathDone
 
 if not "%JSSE_OPTS%" == "" goto gotJsseOpts
-set JSSE_OPTS="-Djdk.tls.ephemeralDHKeySize=2048"
+set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048"
 :gotJsseOpts
 set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
 


-
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 (6cb87c8 -> a486b9e)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 6cb87c8  BZ 63684: Wrapper never passed to RealmBase#hasRole() for 
given security constraints
 new 491d1c9  Fix JSSE_OPTS quoting in catalina.bat
 new a486b9e  fix JSSE_OPTS quoting

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:
 bin/catalina.bat   | 2 +-
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 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: Fix JSSE_OPTS quoting in catalina.bat

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 491d1c93d2f36808f6693dedbfa96b241af87b35
Author: Felix Schumacher 
AuthorDate: Tue Aug 27 11:55:14 2019 +0200

Fix JSSE_OPTS quoting in catalina.bat

Contributed by Peter Uhnak.
Part of #196 on github
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1ff6a47..fae50c6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -205,6 +205,10 @@
 Add simplified Chinese translations to the standard Tomcat 
distribution.
 (markt)
   
+  
+Fix JSSE_OPTS quoting in catalina.bat.
+Contributed by Peter Uhnak. (fschumacher)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/02: fix JSSE_OPTS quoting

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 2f33f550689ce17333a492477f7f35fb728258bf
Author: Peter Uhnak 
AuthorDate: Mon Aug 26 11:31:43 2019 +0200

fix JSSE_OPTS quoting

Part of #196 on github
---
 bin/catalina.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 982b23f..eaced8d 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -206,7 +206,7 @@ set 
"CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"
 :juliClasspathDone
 
 if not "%JSSE_OPTS%" == "" goto gotJsseOpts
-set JSSE_OPTS="-Djdk.tls.ephemeralDHKeySize=2048"
+set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048"
 :gotJsseOpts
 set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Fix JSSE_OPTS quoting in catalina.bat

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 88ae81a72adcc106917b9a138aa7b3cbe7c569b7
Author: Felix Schumacher 
AuthorDate: Tue Aug 27 11:55:14 2019 +0200

Fix JSSE_OPTS quoting in catalina.bat

Contributed by Peter Uhnak.
Part of #196 on github
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f7c25c0..13c63a6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,10 @@
 62140: Additional usage documentation in comments for
 catalina.[bat|sh]. (markt)
   
+  
+Fix JSSE_OPTS quoting in catalina.bat.
+Contributed by Peter Uhnak. (fschumacher)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix typo (missing a on via)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 6b125eb  Fix typo (missing a on via)
6b125eb is described below

commit 6b125eb8df2074bad094d0a8f090a59f0d6a692b
Author: Felix Schumacher 
AuthorDate: Tue Aug 27 11:58:30 2019 +0200

Fix typo (missing a on via)
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 976852c..64cf807 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -373,7 +373,7 @@
 compatibility. (remm)
   
   
-Fix typo in UTF-32LE charset name. Patch by zhanhb vi Github.
+Fix typo in UTF-32LE charset name. Patch by zhanhb via Github.
 (fschumacher)
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Fix JSSE_OPTS quoting in catalina.bat

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 07a2804b43eb1ed5c5e09e3fbf54b28aaa11ff58
Author: Felix Schumacher 
AuthorDate: Tue Aug 27 11:55:14 2019 +0200

Fix JSSE_OPTS quoting in catalina.bat

Contributed by Peter Uhnak.
Closes #196 on github
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f3431f4..976852c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -76,6 +76,10 @@
 62140: Additional usage documentation in comments for
 catalina.[bat|sh]. (markt)
   
+  
+Fix JSSE_OPTS quoting in catalina.bat.
+Contributed by Peter Uhnak. (fschumacher)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (8f86f92 -> 07a2804)

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 8f86f92  Update to 9.0.24
 new 162dd79  fix JSSE_OPTS quoting
 new 07a2804  Fix JSSE_OPTS quoting in catalina.bat

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:
 bin/catalina.bat   | 2 +-
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 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: fix JSSE_OPTS quoting

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 162dd79f16daaafd49ea68231525cbb650216169
Author: Peter Uhnak 
AuthorDate: Mon Aug 26 11:31:43 2019 +0200

fix JSSE_OPTS quoting

Part of #196 on github
---
 bin/catalina.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 982b23f..eaced8d 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -206,7 +206,7 @@ set 
"CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"
 :juliClasspathDone
 
 if not "%JSSE_OPTS%" == "" goto gotJsseOpts
-set JSSE_OPTS="-Djdk.tls.ephemeralDHKeySize=2048"
+set "JSSE_OPTS=-Djdk.tls.ephemeralDHKeySize=2048"
 :gotJsseOpts
 set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix charset name for UTF-32LE in bom detection.

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 d328560  Fix charset name for UTF-32LE in bom detection.
d328560 is described below

commit d32856033bf762b63f95e82209ec92156d16d351
Author: zhanhb <6323014+zha...@users.noreply.github.com>
AuthorDate: Fri Jun 21 20:42:45 2019 +0800

Fix charset name for UTF-32LE in bom detection.

Patch by zhanhb vi Github. Closes #173 on Github
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 6 +++---
 webapps/docs/changelog.xml| 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 1060b9b..a9ba7b6 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1214,7 +1214,7 @@ public class DefaultServlet extends HttpServlet {
 return StandardCharsets.UTF_16BE;
 }
 // Delay the UTF_16LE check if there are more that 2 bytes since it
-// overlaps with UTF32-LE.
+// overlaps with UTF-32LE.
 if (count == 2 && b0 == 0xFF && b1 == 0xFE) {
 skip(is, 2);
 return StandardCharsets.UTF_16LE;
@@ -1241,10 +1241,10 @@ public class DefaultServlet extends HttpServlet {
 // Look for 4-byte BOMs
 int b3 = bom[3] & 0xFF;
 if (b0 == 0x00 && b1 == 0x00 && b2 == 0xFE && b3 == 0xFF) {
-return Charset.forName("UTF32-BE");
+return Charset.forName("UTF-32BE");
 }
 if (b0 == 0xFF && b1 == 0xFE && b2 == 0x00 && b3 == 0x00) {
-return Charset.forName("UTF32-LE");
+return Charset.forName("UTF-32LE");
 }
 
 // Now we can check for UTF16-LE. There is an assumption here that we
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 243b3b9..d1d9477 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -56,6 +56,9 @@
 63523: Restore SSLUtilBase methods as protected to preserve
 compatibility. (remm)
   
+  Fix typo in UTF-32LE charset name. Patch by zhanhb vi Github.
+(fschumacher)
+  
 
   
   


-
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: Use spotbugs instead of findbugs

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 96df339  Use spotbugs instead of findbugs
96df339 is described below

commit 96df33983ffdad304674bc6fae11cc7c4a887eb1
Author: Felix Schumacher 
AuthorDate: Sat May 4 16:26:41 2019 +0200

Use spotbugs instead of findbugs
---
 BUILDING.txt   |  2 +-
 build.properties.default   | 11 +--
 webapps/docs/changelog.xml |  5 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 7f90c54..e0811af 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -529,7 +529,7 @@ target. The command is:
 NOTE: FindBugs is licensed under LGPL. Using Findbugs during Tomcat build is
   optional and is off by default.
 
-  See http://findbugs.sourceforge.net/ for more information.
+  See https://spotbugs.github.io/ for more information.
 
 To enable FindBugs, add the following property to build.properties file:
 
diff --git a/build.properties.default b/build.properties.default
index 4dd3905..be14532 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -267,11 +267,10 @@ cobertura.lib=${cobertura.home}/lib
 cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
 
 # - Findbugs -
-findbugs.version=3.0.1
+findbugs.version=3.1.12
 findbugs.checksum.enabled=true
 findbugs.checksum.algorithm=MD5|SHA-1
-findbugs.checksum.value=dec8828de8657910fcb258ce5383c168|59a24064ca6869e483ce9a04d3c50d14a227d5e6
-findbugs.home=${base.path}/findbugs-${findbugs.version}
-findbugs.lib=${findbugs.home}/lib
-findbugs.jar=${findbugs.lib}/findbugs-ant.jar
-findbugs.loc=${base-sf.loc}/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.tar.gz
+findbugs.checksum.value=8c54502a8e1b78ea6b173a186ce6f379|95114d9aaeeba7bd4ea5a3d6a2167cd6c87bb943
+findbugs.home=${base.path}/spotbugs-${findbugs.version}
+findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
+findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bd7f589..a6792d4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,11 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  Switch from FindBugs to SpotBugs. (fschumacher)
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Use spotbugs instead of findbugs

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 51241d8  Use spotbugs instead of findbugs
51241d8 is described below

commit 51241d8b53d80dd8e795d6373fed84aa471d3a85
Author: Felix Schumacher 
AuthorDate: Sat May 4 16:26:41 2019 +0200

Use spotbugs instead of findbugs
---
 BUILDING.txt   |  2 +-
 build.properties.default   | 10 +-
 webapps/docs/changelog.xml |  5 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 331184a..1f618fb 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -523,7 +523,7 @@ target. The command is:
 NOTE: FindBugs is licensed under LGPL. Using Findbugs during Tomcat build is
   optional and is off by default.
 
-  See http://findbugs.sourceforge.net/ for more information.
+  See https://spotbugs.github.io/ for more information.
 
 To enable FindBugs, add the following property to build.properties file:
 
diff --git a/build.properties.default b/build.properties.default
index 960ed5b..1bacc19 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -264,13 +264,13 @@ 
cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
 cobertura.loc=${base-sf.loc}/cobertura/cobertura-2.1.1-bin.tar.gz
 
 # - Findbugs -
-findbugs.version=3.0.1
+findbugs.version=3.1.12
 findbugs.checksum.enabled=true
 findbugs.checksum.algorithm=MD5|SHA-1
-findbugs.checksum.value=dec8828de8657910fcb258ce5383c168|59a24064ca6869e483ce9a04d3c50d14a227d5e6
-findbugs.home=${base.path}/findbugs-${findbugs.version}
-findbugs.jar=${findbugs.home}/lib/findbugs-ant.jar
-findbugs.loc=${base-sf.loc}/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.tar.gz
+findbugs.checksum.value=8c54502a8e1b78ea6b173a186ce6f379|95114d9aaeeba7bd4ea5a3d6a2167cd6c87bb943
+findbugs.home=${base.path}/spotbugs-${findbugs.version}
+findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
+findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
 
 # - SAAJ API, used by Code Signing for releases -
 # - No longer part of JRE from Java 11 onwards  -
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c2a4018..b35610c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,11 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  Switch from FindBugs to SpotBugs. (fschumacher)
+
+  
 
 
   


-
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: Correct doubled words

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 d923443  Correct doubled words
d923443 is described below

commit d923443f48b2b5c4e24f6f73b1cc01a0fcf38189
Author: Felix Schumacher 
AuthorDate: Fri Mar 22 18:08:23 2019 +0100

Correct doubled words

These are a few places where the following script found duplicated word:

 $ grep -rP '\b([a-z]\w+)\s+\1\b' webapps/
---
 RELEASE-NOTES   |  2 +-
 webapps/docs/changelog.xml  | 14 +++---
 webapps/examples/WEB-INF/classes/HelloWorldExample.java |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d3fe912..43ea7ae 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -180,7 +180,7 @@ To enable and configue SSI support, please see the 
ssi-howto.html page.
 Security manager URLs:
 ==
 In order to grant security permissions to JARs located inside the
-web application repository, use URLs of of the following format
+web application repository, use URLs of the following format
 in your policy file:
 
 file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0499770..c1526fd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -815,7 +815,7 @@
   
 
   
-Log an error message if the AJP connector detects the the reverse proxy
+Log an error message if the AJP connector detects that the reverse 
proxy
 is sending AJP messages that are too large for the configured
 packetSize. (markt)
   
@@ -2057,7 +2057,7 @@
 
   
 Review those places where Tomcat re-encodes a URI or URI component and
-ensure that that correct encoding (path differs from query string) is
+ensure that the correct encoding (path differs from query string) is
 applied and that the encoding is applied consistently. (markt)
   
   
@@ -3438,7 +3438,7 @@
 examples web application. (markt)
   
   
-59229: Fix error in HTTP docs and make clear the the HTTP 
NIO
+59229: Fix error in HTTP docs and make clear that the HTTP 
NIO
 connector uses non-blocking I/O to read the HTTP request headers.
 (markt)
   
@@ -5623,7 +5623,7 @@
 client implementation. Patch provided by Niklas Hallqvist. (markt)
   
   
-57118: Ensure that that an EncodeException is
+57118: Ensure that an EncodeException is
 thrown by RemoteEndpoint.Basic.sendObject(Object) rather
 than an IOException when no suitable Encoder
 is configured for the given Object. (markt)
@@ -12332,7 +12332,7 @@
   
 The fix for bug 51310 caused a regression that re-introduced
 bug 49957 and deleted the contents of the work directory
-when Tomcat was shutdown. This fix ensures that that work directory for
+when Tomcat was shutdown. This fix ensures that the work directory for
 an application is not deleted when Tomcat is shutdown. (markt)
   
   
@@ -14174,7 +14174,7 @@
   
   
 50222: Modify memory leak prevention code so it pins the
-system class loader in memory rather than than the common class loader,
+system class loader in memory rather than the common class loader,
 which is better for embedded systems. Patch provided by Christopher
 Schultz. (markt)
   
@@ -14926,7 +14926,7 @@
   
   
 Update a few places in the docs where the Manager documentation 
referred
-to the old role name of manager rather than than the new 
manager-script.
+to the old role name of manager rather than the new manager-script.
 (markt)
   
 
diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java 
b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
index b642aba..49b8601 100644
--- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
@@ -54,7 +54,7 @@ public class HelloWorldExample extends HttpServlet {
 
 // note that all links are created to be relative. this
 // ensures that we can move the web application that this
-// servlet belongs to to a different place in the url
+// servlet belongs to a different place in the url
 // tree and not have any harmful side effects.
 
 // XXX


-
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: Correct doubled words

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 f897666  Correct doubled words
f897666 is described below

commit f8970abace814fc5aef8d64fe0afad235c41
Author: Felix Schumacher 
AuthorDate: Fri Mar 22 18:08:23 2019 +0100

Correct doubled words

These are a few places where the following script found duplicated word:

 $ grep -rP '\b([a-z]\w+)\s+\1\b' webapps/
---
 RELEASE-NOTES   | 2 +-
 webapps/docs/changelog.xml  | 4 ++--
 webapps/examples/WEB-INF/classes/HelloWorldExample.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2a52a3d..d9cc4af 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -120,7 +120,7 @@ and putting them in the shared classloader instead (JARs 
should be put in the
 Security manager URLs:
 ==
 In order to grant security permissions to JARs located inside the
-web application repository, use URLs of of the following format
+web application repository, use URLs of the following format
 in your policy file:
 
 file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0fce5c0..dee1320 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1244,7 +1244,7 @@
 Consistent exception propagation for NIO2 SSL close. (remm)
   
   
-Log an error message if the AJP connector detects the the reverse proxy
+Log an error message if the AJP connector detects that the reverse 
proxy
 is sending AJP messages that are too large for the configured
 packetSize. (markt)
   
@@ -3095,7 +3095,7 @@
 
   
 Review those places where Tomcat re-encodes a URI or URI component and
-ensure that that correct encoding (path differs from query string) is
+ensure that the correct encoding (path differs from query string) is
 applied and that the encoding is applied consistently. (markt)
   
   
diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java 
b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
index 1a5ea5a..4a75a4d 100644
--- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
@@ -56,7 +56,7 @@ public class HelloWorldExample extends HttpServlet {
 
 // note that all links are created to be relative. this
 // ensures that we can move the web application that this
-// servlet belongs to to a different place in the url
+// servlet belongs to a different place in the url
 // tree and not have any harmful side effects.
 
 // XXX


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Correct doubled words

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 1c69b25  Correct doubled words
1c69b25 is described below

commit 1c69b2528790d40569f4b4b034c184ee21ccaea1
Author: Felix Schumacher 
AuthorDate: Fri Mar 22 18:08:23 2019 +0100

Correct doubled words

These are a few places where the following script found duplicated word:

 $ grep -rP '\b([a-z]\w+)\s+\1\b' webapps/
---
 RELEASE-NOTES   | 2 +-
 webapps/docs/changelog.xml  | 6 +++---
 webapps/examples/WEB-INF/classes/HelloWorldExample.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a6ced8c..2377d4f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -115,7 +115,7 @@ and putting them in the shared classloader instead (JARs 
should be put in the
 Security manager URLs:
 ==
 In order to grant security permissions to JARs located inside the
-web application repository, use URLs of of the following format
+web application repository, use URLs of the following format
 in your policy file:
 
 file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0f39d60..5c5331c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -608,7 +608,7 @@
   
 Add dns-ping support to enumerate cluster members. This is much simpler
 than getting the pod list but it does not indicate pod status.
-Submitted by by Maxime Beck. (remm)
+Submitted by Maxime Beck. (remm)
   
   
 Never expire the local member from a Membership. (remm)
@@ -1678,7 +1678,7 @@
 Followup sync fix for NIO2 async IO blocking read/writes. (remm)
   
   
-Log an error message if the AJP connector detects the the reverse proxy
+Log an error message if the AJP connector detects that the reverse 
proxy
 is sending AJP messages that are too large for the configured
 packetSize. (markt)
   
@@ -3798,7 +3798,7 @@
 
   
 Review those places where Tomcat re-encodes a URI or URI component and
-ensure that that correct encoding (path differs from query string) is
+ensure that the correct encoding (path differs from query string) is
 applied and that the encoding is applied consistently. (markt)
   
   
diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java 
b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
index 1a5ea5a..4a75a4d 100644
--- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
@@ -56,7 +56,7 @@ public class HelloWorldExample extends HttpServlet {
 
 // note that all links are created to be relative. this
 // ensures that we can move the web application that this
-// servlet belongs to to a different place in the url
+// servlet belongs to a different place in the url
 // tree and not have any harmful side effects.
 
 // XXX


-
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: Don't exclude the ide support sample files for idea when packaging the src for a release

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 a3d815c  Don't exclude the ide support sample files for idea when 
packaging the src for a release
a3d815c is described below

commit a3d815c0c11aa2571d6039cb162bcb2edda42202
Author: Felix Schumacher 
AuthorDate: Sat Mar 16 14:43:50 2019 +0100

Don't exclude the ide support sample files for idea when packaging the src 
for a release
---
 build.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6b54267..660304a 100644
--- a/build.xml
+++ b/build.xml
@@ -2132,7 +2132,13 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 -->
 
 
-
+
+  
+  
+  
+
+  
+
 
 
 


-
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: Don't exclude the ide support sample files for idea when packaging the src for a release

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 fb01e55  Don't exclude the ide support sample files for idea when 
packaging the src for a release
fb01e55 is described below

commit fb01e550dec9c83682493a4204739577caba6367
Author: Felix Schumacher 
AuthorDate: Sat Mar 16 14:43:50 2019 +0100

Don't exclude the ide support sample files for idea when packaging the src 
for a release
---
 build.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c1cfc61..2a7ea9c 100644
--- a/build.xml
+++ b/build.xml
@@ -2004,7 +2004,13 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 -->
 
 
-
+
+  
+  
+  
+
+  
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Don't exclude the ide support sample files for idea when packaging the src for a release

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 9d839a5  Don't exclude the ide support sample files for idea when 
packaging the src for a release
9d839a5 is described below

commit 9d839a547d3b3f0da5b7e10c77c4975b9d3a1b31
Author: Felix Schumacher 
AuthorDate: Sat Mar 16 14:43:50 2019 +0100

Don't exclude the ide support sample files for idea when packaging the src 
for a release
---
 build.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c97a945..524e049 100644
--- a/build.xml
+++ b/build.xml
@@ -2065,7 +2065,13 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 -->
 
 
-
+
+  
+  
+  
+
+  
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1853984 - in /tomcat/site/trunk: docs/download-90.html xdocs/download-90.xml

[fschumacher]

Author: fschumacher
Date: Wed Feb 20 19:43:42 2019
New Revision: 1853984

URL: http://svn.apache.org/viewvc?rev=1853984=rev
Log:
Extras have been merged into the main artefacts, so remove the dangling links.

Modified:
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/xdocs/download-90.xml

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1853984=1853983=1853984=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Feb 20 19:43:42 2019
@@ -357,27 +357,6 @@
 
 
 
-Extras:
-  
-  
-
-
-JMX Remote jar 
-(https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-jmx-remote.jar.asc;>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-jmx-remote.jar.sha512;>sha512)
-  
-  
-
-
-Web services jar 
-(https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-ws.jar.asc;>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-ws.jar.sha512;>sha512)
-  
-  
-
-
-
-
 Embedded:
   
   

Modified: tomcat/site/trunk/xdocs/download-90.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-90.xml?rev=1853984=1853983=1853984=diff
==
--- tomcat/site/trunk/xdocs/download-90.xml (original)
+++ tomcat/site/trunk/xdocs/download-90.xml Wed Feb 20 19:43:42 2019
@@ -126,20 +126,6 @@
   
   
 
-Extras:
-  
-  
-JMX Remote jar 
-(https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-jmx-remote.jar.asc;>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-jmx-remote.jar.sha512;>sha512)
-  
-  
-Web services jar 
-(https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-ws.jar.asc;>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-9/v[v]/bin/extras/catalina-ws.jar.sha512;>sha512)
-  
-  
-
 Embedded:
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1843477 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/docs/config/

[fschumacher]

Author: fschumacher
Date: Wed Oct 10 17:19:30 2018
New Revision: 1843477

URL: http://svn.apache.org/viewvc?rev=1843477=rev
Log:
Mostly spacepolice

Correct usage of whitespace after closing tags. All those places were found
by using

 grep -rP ']+>(?!s([\s.]|$))\w' webapps/

Correct one surplus 'n' in changelog.xml

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-deployer.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-valve.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 10 17:19:30 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767

svn commit: r1843475 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/ webapps/docs/config/

[fschumacher]

Author: fschumacher
Date: Wed Oct 10 17:15:35 2018
New Revision: 1843475

URL: http://svn.apache.org/viewvc?rev=1843475=rev
Log:
Spacepolice

Correct usage of whitespace after closing tags. All those places were found
by using

 grep -rP ']+>(?!s([\s.]|$))\w' webapps/


Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-deployer.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-valve.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/tomcat-docs.xsl
tomcat/tc8.5.x/trunk/webapps/docs/windows-auth-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 10 17:15:35 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761

svn commit: r1843474 - in /tomcat/trunk/webapps/docs: ./ config/

[fschumacher]

Author: fschumacher
Date: Wed Oct 10 17:12:37 2018
New Revision: 1843474

URL: http://svn.apache.org/viewvc?rev=1843474=rev
Log:
Mostly spacepolice

Correct usage of whitespace after closing tags. All those places were found
by using

 grep -rP ']+>(?!s([\s.]|$))\w' webapps/

Correct one missing colon and one surplus 'n' in changelog.xml

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/cluster-deployer.xml
tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/trunk/webapps/docs/config/cluster-membership.xml
tomcat/trunk/webapps/docs/config/cluster-valve.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
tomcat/trunk/webapps/docs/tomcat-docs.xsl
tomcat/trunk/webapps/docs/windows-auth-howto.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1843474=1843473=1843474=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 10 17:12:37 2018
@@ -1625,7 +1625,7 @@
   
 
   
-61312: Prevent NullPointerExceptionn when using
+61312: Prevent NullPointerException when using
 the statement cache of connection that has been closed. (kfujino)
   
 
@@ -2533,7 +2533,7 @@
 Christian Stöber. (markt)
   
   
-61127Allow human-readable names for channelSendOptions and
+61127: Allow human-readable names for channelSendOptions and
 mapSendOptions. Patch provided by Igal Sapir. (schultz)
   
 

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1843474=1843473=1843474=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Wed Oct 10 17:12:37 2018
@@ -148,7 +148,7 @@
 
 
   A comma-separated list of HTTP methods for which request
-  bodies using application/x-www-form-urlencodedwill be parsed
+  bodies using application/x-www-form-urlencoded will be 
parsed
   for request parameters identically to POST. This is useful in RESTful
   applications that want to support POST-style semantics for PUT requests.
   Note that any setting other than POST causes Tomcat

Modified: tomcat/trunk/webapps/docs/config/cluster-deployer.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-deployer.xml?rev=1843474=1843473=1843474=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-deployer.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-deployer.xml Wed Oct 10 17:12:37 
2018
@@ -36,7 +36,7 @@
 
   The Farm War Deployer can deploy and undeploy web applications on the 
other
   nodes in the cluster.
-  Note: FarmWarDeployer can be configured at host level
+  Note: FarmWarDeployer can be configured at host level
   cluster only.
   
 

Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1843474=1843473=1843474=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Wed Oct 10 
17:12:37 2018
@@ -157,7 +157,7 @@
  
  
If true is set, read the response of the test message that sent. 
Default is false.
-   Note: if performSendTest is false, this 
attribute will have no effect.
+   Note: if performSendTest is false, this 
attribute will have no effect.
  
  
Specifies the timeout, in milliseconds, to use when performing a read 
test

Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-membership.xml?rev=1843474=1843473=1843474=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-membership.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-membership.xml Wed Oct 10 17:12:37 
2018
@@ -225,7 +225,7 @@
 
   
   Static Membership Service allows nesting of a 
LocalMember
-  and Memberelement.
+  and Member element.
   
   
 LocalMember: 

Modified: tomcat/trunk/webapps/docs/config/cluster-valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-valve.xml?rev=1843474=1843473=1843474=diff
==
--- tomcat/trunk/webapps/d

svn commit: r1841767 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/host.xml webapps/docs/virtual-hosting-howto.xml

[fschumacher]

Author: fschumacher
Date: Sun Sep 23 17:30:59 2018
New Revision: 1841767

URL: http://svn.apache.org/viewvc?rev=1841767=rev
Log:
Add documentation about the files context.xml.default and web.xml.default

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
tomcat/tc7.0.x/trunk/webapps/docs/virtual-hosting-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 23 17:30:59 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303

svn commit: r1841766 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/host.xml webapps/docs/virtual-hosting-howto.xml

[fschumacher]

Author: fschumacher
Date: Sun Sep 23 17:24:56 2018
New Revision: 1841766

URL: http://svn.apache.org/viewvc?rev=1841766=rev
Log:
Add documentation about the files context.xml.default and web.xml.default

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/host.xml
tomcat/tc8.5.x/trunk/webapps/docs/virtual-hosting-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 23 17:24:56 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319

svn commit: r1841746 - in /tomcat/trunk/webapps/docs: changelog.xml config/host.xml virtual-hosting-howto.xml

[fschumacher]

Author: fschumacher
Date: Sun Sep 23 11:14:20 2018
New Revision: 1841746

URL: http://svn.apache.org/viewvc?rev=1841746=rev
Log:
Add documentation about the files context.xml.default and web.xml.default

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/host.xml
tomcat/trunk/webapps/docs/virtual-hosting-howto.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1841746=1841745=1841746=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Sep 23 11:14:20 2018
@@ -81,6 +81,11 @@
 Call setAddDefaultWebXmlToWebapp(false) to prevent the 
 automatic config. (isapir)
   
+  
+Add documentation about the files context.xml.default and
+web.xml.default that can be used to customize 
conf/context.xml
+and conf/web.xml on a per host basis. (fschumacher)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/host.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1841746=1841745=1841746=diff
==
--- tomcat/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/trunk/webapps/docs/config/host.xml Sun Sep 23 11:14:20 2018
@@ -653,6 +653,13 @@
 
   
 
+  
+You can override the default values found in 
conf/context.xml and
+conf/web.xml files from $CATALINA_BASE for each 
virtual host.
+Tomcat will look for files named context.xml.default and 
web.xml.default
+in the directory specified by xmlBase and merge the files into
+those found in the default ones.
+  
 
 
 

Modified: tomcat/trunk/webapps/docs/virtual-hosting-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/virtual-hosting-howto.xml?rev=1841746=1841745=1841746=diff
==
--- tomcat/trunk/webapps/docs/virtual-hosting-howto.xml (original)
+++ tomcat/trunk/webapps/docs/virtual-hosting-howto.xml Sun Sep 23 11:14:20 2018
@@ -122,6 +122,18 @@ $CATALINA_HOME/conf/Catalina/stimpy/ROOT
 cp localhost/manager.xml ren/
 cp localhost/manager.xml stimpy/
 
+
+  
+You can override the default values found in 
conf/context.xml
+and conf/web.xml by specifying the new values in files
+named context.xml.default and web.xml.default
+from the host specific xml directory.
+  Following our previous example, you could use
+$CATALINA_HOME/conf/Catalina/ren/web.xml.default
+to customize the defaults for all webapps that are deployed in the 
virtual
+host named ren.
+  
+
 
   
 Consult the configuration documentation for other attributes of the



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1840351 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/logging.xml

[fschumacher]

Author: fschumacher
Date: Sat Sep  8 10:12:31 2018
New Revision: 1840351

URL: http://svn.apache.org/viewvc?rev=1840351=rev
Log:
Update logging page to currently used configuration.

Apart from some markup changes this change uses the
OneLineFormatter for the example and mentions the
AsyncFileHandler.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/logging.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep  8 10:12:31 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319

svn commit: r1840264 - /tomcat/trunk/webapps/docs/logging.xml

[fschumacher]

Author: fschumacher
Date: Thu Sep  6 20:46:24 2018
New Revision: 1840264

URL: http://svn.apache.org/viewvc?rev=1840264=rev
Log:
Update logging page to currently used configuration.

Apart from some markup changes this change uses the
OneLineFormatter for the example and mentions the
AsyncFileHandler.

Modified:
tomcat/trunk/webapps/docs/logging.xml

Modified: tomcat/trunk/webapps/docs/logging.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1840264=1840263=1840264=diff
==
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Thu Sep  6 20:46:24 2018
@@ -17,6 +17,7 @@
 -->
 
+  
 ]>
 
 
@@ -241,11 +242,12 @@
 The default logging.properties in the JRE specifies a
 ConsoleHandler that routes logging to System.err.
 The default conf/logging.properties in Apache Tomcat also
-adds several FileHandlers that write to files.
+adds several AsyncFileHandlers that write to files.
   
   
-A handler's log level threshold is INFO by default and can be set using
-SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST or ALL.
+A handler's log level threshold is INFO by default and can be 
set using
+SEVERE, WARNING, INFO, 
CONFIG,
+FINE, FINER, FINEST or 
ALL.
 You can also target specific packages to collect logging from and specify
 a level.
   
@@ -272,7 +274,7 @@ java.util.logging.ConsoleHandler.level=A
   digit, and ends with '.'. For example, 22foobar. is a valid
   prefix.
   System property replacement is performed for property values which
-  contain ${systemPropertyName}.
+  contain ${systemPropertyName}.
   If using a class loader that implements the
   org.apache.juli.WebappProperties interface (Tomcats
   web application class loader does) then property replacement is also
@@ -290,14 +292,14 @@ java.util.logging.ConsoleHandler.level=A
By default the log files will be kept on the file system
   90 days. This may be changed per handler using the
   handlerName.maxDays property. If the specified value for the
-  property is =0 then the log files will be kept on the
+  property is 0 then the log files will be kept on the
   file system forever, otherwise they will be kept the specified maximum
   days.
   
   
 There are several additional implementation classes, that can be used
-together with the ones provided by Java. The notable one is
-org.apache.juli.FileHandler.
+together with the ones provided by Java. The notable ones are
+org.apache.juli.FileHandler and 
org.apache.juli.AsyncFileHandler.
   
   
 org.apache.juli.FileHandler supports buffering of the
@@ -310,6 +312,12 @@ java.util.logging.ConsoleHandler.level=A
   applied.
   
   
+org.apache.juli.AsyncFileHandler is a subclass of 
FileHandler
+  that queues the log messages and writes them asynchronously to the log 
files.
+  Its additional behaviour can be configured by setting some
+  system properties.
+  
+  
 Example logging.properties file to be placed in $CATALINA_BASE/conf:
   
   
+java.util.logging.ConsoleHandler.formatter = 
java.util.logging.OneLineFormatter]]>
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1838190 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/

[fschumacher]

Author: fschumacher
Date: Thu Aug 16 11:05:04 2018
New Revision: 1838190

URL: http://svn.apache.org/viewvc?rev=1838190=rev
Log:
Use isEmpty instead of size on collections to test for emptiness

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 16 11:05:04 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082

svn commit: r1838189 - in /tomcat/tc8.5.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/

[fschumacher]

Author: fschumacher
Date: Thu Aug 16 11:03:13 2018
New Revision: 1838189

URL: http://svn.apache.org/viewvc?rev=1838189=rev
Log:
Use isEmpty instead of size on collections to test for emptiness

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 16 11:03:13 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201

svn commit: r1838188 - in /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java FairBlockingQueue.java MultiLockFairBlockingQueue.java interceptor/StatementFin

[fschumacher]

Author: fschumacher
Date: Thu Aug 16 11:01:13 2018
New Revision: 1838188

URL: http://svn.apache.org/viewvc?rev=1838188=rev
Log:
Use isEmpty instead of size on collections to test for emptiness

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1838188=1838187=1838188=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Thu Aug 16 11:01:13 2018
@@ -387,8 +387,8 @@ public class ConnectionPool {
 }
 
 /* release all idle connections */
-BlockingQueue pool = 
(idle.size()>0)?idle:(force?busy:idle);
-while (pool.size()>0) {
+BlockingQueue pool = 
(!idle.isEmpty())?idle:(force?busy:idle);
+while (!pool.isEmpty()) {
 try {
 //retrieve the next connection
 PooledConnection con = pool.poll(1000, TimeUnit.MILLISECONDS);
@@ -399,7 +399,7 @@ public class ConnectionPool {
 release(con);
 else
 abandon(con);
-if (pool.size()>0) {
+if (!pool.isEmpty()) {
 con = pool.poll(1000, TimeUnit.MILLISECONDS);
 } else {
 break;
@@ -410,7 +410,7 @@ public class ConnectionPool {
 Thread.currentThread().interrupt();
 }
 }
-if (pool.size()==0 && force && pool!=busy) pool = busy;
+if (pool.isEmpty() && force && pool!=busy) pool = busy;
 }
 if (this.getPoolProperties().isJmxEnabled()) this.jmxPool = null;
 PoolProperties.InterceptorDefinition[] proxies = 
getPoolProperties().getJdbcInterceptorsAsArray();
@@ -980,7 +980,7 @@ public class ConnectionPool {
  */
 public void checkAbandoned() {
 try {
-if (busy.size()==0) return;
+if (busy.isEmpty()) return;
 Iterator locked = busy.iterator();
 int sto = getPoolProperties().getSuspectTimeout();
 while (locked.hasNext()) {
@@ -1027,7 +1027,7 @@ public class ConnectionPool {
 public void checkIdle(boolean ignoreMinSize) {
 
 try {
-if (idle.size()==0) return;
+if (idle.isEmpty()) return;
 long now = System.currentTimeMillis();
 Iterator unlocked = idle.iterator();
 while ( (ignoreMinSize || 
(idle.size()>=getPoolProperties().getMinIdle())) && unlocked.hasNext()) {
@@ -1072,7 +1072,7 @@ public class ConnectionPool {
  */
 public void testAllIdle() {
 try {
-if (idle.size()==0) return;
+if (idle.isEmpty()) return;
 Iterator unlocked = idle.iterator();
 while (unlocked.hasNext()) {
 PooledConnection con = unlocked.next();
@@ -1413,7 +1413,7 @@ public class ConnectionPool {
 cleaner.cancel();
 if (poolCleanTimer != null) {
 poolCleanTimer.purge();
-if (cleaners.size() == 0) {
+if (cleaners.isEmpty()) {
 poolCleanTimer.cancel();
 poolCleanTimer = null;
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java?rev=1838188=1838187=1838188=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
 Thu Aug 16 11:01:13 2018
@@ -96,7 +96,7 @@ public class FairBlockingQueue implem
 ExchangeCountDownLatch c = null;
 try {
 //check to see if threads are waiting for an object
-if (waiters.size() > 0) {
+if (!waiters.isEmpty()) {
 //if threads are waiting grab the latch for that thread
 c = waiters.p

svn commit: r1837867 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/realm.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 11:47:15 2018
New Revision: 1837867

URL: http://svn.apache.org/viewvc?rev=1837867=rev
Log:
Document the default for appName in JAASRealm

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 11:47:15 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874

svn commit: r1837866 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/config/realm.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 11:45:51 2018
New Revision: 1837866

URL: http://svn.apache.org/viewvc?rev=1837866=rev
Log:
Document the default for appName in JAASRealm

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/config/realm.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 11:45:51 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634

svn commit: r1837865 - /tomcat/trunk/webapps/docs/config/realm.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 11:43:44 2018
New Revision: 1837865

URL: http://svn.apache.org/viewvc?rev=1837865=rev
Log:
Document the default for appName in JAASRealm

Modified:
tomcat/trunk/webapps/docs/config/realm.xml

Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1837865=1837864=1837865=diff
==
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Sat Aug 11 11:43:44 2018
@@ -911,10 +911,14 @@
 one of those roles.
   
 
-  
+  
The name of the application as configured in your login configuration
file
(http://docs.oracle.com/javase/1.4.2/docs/guide/security/jaas/tutorials/LoginConfigFile.html;>JAAS
 LoginConfig).
+   If not specified appName is derived from the Container's
+   name it is placed in, for example Catalina or 
ROOT.
+   If the realm is not placed in any Container, the default is 
Tomcat.
+   
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837861 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JAASRealm.java

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 10:40:19 2018
New Revision: 1837861

URL: http://svn.apache.org/viewvc?rev=1837861=rev
Log:
Spacepolice

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:40:19 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874

svn commit: r1837859 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 10:39:14 2018
New Revision: 1837859

URL: http://svn.apache.org/viewvc?rev=1837859=rev
Log:
Simplify construction of appName from container name in JAASRealm.

There is no need to add a slash in front of the container name as
the method makeLegalForJAAS will strip it off directly afterwards.
That removes the need for a temporary variable.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:39:14 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576

svn commit: r1837858 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/CorsFilter.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 10:37:55 2018
New Revision: 1837858

URL: http://svn.apache.org/viewvc?rev=1837858=rev
Log:
Use short circuit logic to prevent potential NPE in CorsFilter.

The same logic is used a few lines below, so it was most probably
intended that way anyways.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:37:55 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576

svn commit: r1837856 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/JAASRealm.java

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 10:32:31 2018
New Revision: 1837856

URL: http://svn.apache.org/viewvc?rev=1837856=rev
Log:
Spacepolice

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:32:31 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634

svn commit: r1837855 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 10:31:10 2018
New Revision: 1837855

URL: http://svn.apache.org/viewvc?rev=1837855=rev
Log:
Simplify construction of appName from container name in JAASRealm.

There is no need to add a slash in front of the container name as
the method makeLegalForJAAS will strip it off directly afterwards.
That removes the need for a temporary variable.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:31:10 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201

svn commit: r1837854 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/CorsFilter.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Sat Aug 11 10:29:26 2018
New Revision: 1837854

URL: http://svn.apache.org/viewvc?rev=1837854=rev
Log:
Use short circuit logic to prevent potential NPE in CorsFilter.

The same logic is used a few lines below, so it was most probably
intended that way anyways.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:29:26 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319

svn commit: r1837788 - /tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java

[fschumacher]

Author: fschumacher
Date: Fri Aug 10 10:10:18 2018
New Revision: 1837788

URL: http://svn.apache.org/viewvc?rev=1837788=rev
Log:
Spacepolice

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1837788=1837787=1837788=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Aug 10 
10:10:18 2018
@@ -226,7 +226,7 @@ public class JAASRealm extends RealmBase
 public void setContainer(Container container) {
 super.setContainer(container);
 
-if( appName==null  ) {
+if (appName == null) {
 appName = makeLegalForJAAS(container.getName());
 
 log.info("Set JAAS app name " + appName);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837787 - in /tomcat/trunk: java/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Fri Aug 10 10:08:54 2018
New Revision: 1837787

URL: http://svn.apache.org/viewvc?rev=1837787=rev
Log:
Simplify construction of appName from container name in JAASRealm.

There is no need to add a slash in front of the container name as
the method makeLegalForJAAS will strip it off directly afterwards.
That removes the need for a temporary variable.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1837787=1837786=1837787=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Aug 10 
10:08:54 2018
@@ -227,13 +227,7 @@ public class JAASRealm extends RealmBase
 super.setContainer(container);
 
 if( appName==null  ) {
-String name = container.getName();
-if (!name.startsWith("/")) {
-name = "/" + name;
-}
-name = makeLegalForJAAS(name);
-
-appName=name;
+appName = makeLegalForJAAS(container.getName());
 
 log.info("Set JAAS app name " + appName);
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837787=1837786=1837787=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 10:08:54 2018
@@ -106,6 +106,9 @@
   
 Use short circuit logic to prevent potential NPE in CorsFilter. 
(fschumacher)
   
+  
+Simplify construction of appName from container name in JAASRealm. 
(fschumacher)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837786 - in /tomcat/trunk: java/org/apache/catalina/filters/CorsFilter.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Fri Aug 10 10:00:18 2018
New Revision: 1837786

URL: http://svn.apache.org/viewvc?rev=1837786=rev
Log:
Use short circuit logic to prevent potential NPE in CorsFilter.

The same logic is used a few lines below, so it was most probably
intended that way anyways. 

Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1837786=1837785=1837786=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri Aug 10 
10:00:18 2018
@@ -453,7 +453,7 @@ public class CorsFilter extends GenericF
 String.valueOf(preflightMaxAge));
 }
 
-if  ((allowedHttpMethods != null & !allowedHttpMethods.isEmpty())) 
{
+if  ((allowedHttpMethods != null) && 
(!allowedHttpMethods.isEmpty())) {
 response.addHeader(
 
CorsFilter.RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_METHODS,
 join(allowedHttpMethods, ","));

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837786=1837785=1837786=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 10:00:18 2018
@@ -103,6 +103,9 @@
 62607: Return a non-zero exit code from
 catalina.[bat|sh] run if Tomcat fails to start. (markt)
   
+  
+Use short circuit logic to prevent potential NPE in CorsFilter. 
(fschumacher)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837171 - /tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java

[fschumacher]

Author: fschumacher
Date: Tue Jul 31 18:27:48 2018
New Revision: 1837171

URL: http://svn.apache.org/viewvc?rev=1837171=rev
Log:
Give correct number of parameters to debug log message.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1837171=1837170=1837171=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Tue Jul 31 
18:27:48 2018
@@ -451,7 +451,7 @@ public class JAASRealm extends RealmBase
 return null;
 }
 if (log.isDebugEnabled()) {
-log.debug(sm.getString("jaasRealm.authenticateSuccess", username));
+log.debug(sm.getString("jaasRealm.authenticateSuccess", username, 
principal));
 }
 
 return principal;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] tomcat pull request #109: fix: file resource read dir inputStream

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/tomcat/pull/109#discussion_r186523700
  
--- Diff: java/org/apache/catalina/webresources/FileResource.java ---
@@ -30,10 +29,6 @@
 import java.security.cert.Certificate;
 import java.util.jar.Manifest;
 
-import org.apache.catalina.WebResourceRoot;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-
--- End diff --

The order of the imports will be checked by checkstyle, so better leave 
them here.


---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] tomcat pull request #109: fix: file resource read dir inputStream

[FSchumacher]

Github user FSchumacher commented on a diff in the pull request:

https://github.com/apache/tomcat/pull/109#discussion_r186523342
  
--- Diff: java/org/apache/catalina/webresources/FileResource.java ---
@@ -16,12 +16,11 @@
  */
 package org.apache.catalina.webresources;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import org.apache.catalina.WebResourceRoot;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+import java.io.*;
--- End diff --

We don't use wildcard imports (except in test cases, where it might be OK)


---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1827867 [12/17] - in /tomcat/site/trunk/docs: tomcat-7.0-doc/ tomcat-8.0-doc/ tomcat-8.5-doc/ tomcat-9.0-doc/

[fschumacher]

Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/manager-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/manager-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-8.5-doc/manager-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-8.5-doc/manager-howto.html Tue Mar 27 
20:24:04 2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 8
   Version 8.5.29,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesManager App HOW-TOTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) Windows Authentication32) Tomcat's JDBC Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat DevelopmentBuildinghref="changelog.html">Changeloghref="http://wiki.apache.org/tomcat/TomcatVersions;>Statushref="developers.html">Developershref="architecture/index.html">Architecturehref="funcspecs/index.html">Functional Specs.href="tribes/introduction.html">Tribes id="mainRight">Manager App HOW-TOid="Table_of_Contents">Table of Contents
 IntroductionConfiguring Manager Application 
AccessHTML User-friendly 
InterfaceSupported Manager 
CommandsCommon 
ParametersDeploy A New 
Application Archive (WAR) RemotelyDeploy A New Application 
from a Local PathDeploy a previously deployed 
webappDeploy a 
Directory or WAR by URLDeploy a Directory or 
War from the Host appBaseDeploy using a 
Context config
 uration ".xml" fileDeployment 
NotesDeploy 
ResponseList Currently Deployed 
ApplicationsReload An 
Existing ApplicationList OS 
and JVM PropertiesList Available Global JNDI 
ResourcesSession 
StatisticsExpire 
SessionsStart an Existing 
ApplicationStop an 
Existing ApplicationUndeploy an Existing 
ApplicationFinding memory 
leaksConne
 ctor SSL/TLS cipher informationConnector SSL/TLS 
certificate chain informationConnector SSL/TLS 
trusted certificate informationThread 
DumpVM InfoSave ConfigurationServer StatusUsing the JMX Proxy ServletWhat is JMX Proxy ServletJMX Query commandJMX Get commandJMX Set commandJMX Invoke commandExecuting Manager Commands With 
AntTasks output capture
 Introduction
 

Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/maven-jars.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/maven-jars.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-8.5-doc/maven-jars.html (original)
+++ tomcat/site/trunk/docs/tomcat-8.5-doc/maven-jars.html Tue Mar 27 20:24:04 
2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 8
   Version 8.5.29,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 

svn commit: r1827867 [13/17] - in /tomcat/site/trunk/docs: tomcat-7.0-doc/ tomcat-8.0-doc/ tomcat-8.5-doc/ tomcat-9.0-doc/

[fschumacher]

Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/ssi-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/ssi-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-8.5-doc/ssi-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-8.5-doc/ssi-howto.html Tue Mar 27 20:24:04 
2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 8
   Version 8.5.29,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesSSI How ToTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) Windows Authentication32) Tomcat's JDBC Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat DevelopmentBuildinghref="changelog.html">Changeloghref="http://wiki.apache.org/tomcat/TomcatVersions;>Statushref="developers.html">Developershref="architecture/index.html">Architecturehref="funcspecs/index.html">Functional Specs.href="tribes/introduction.html">Tribes id="mainRight">SSI How Toid="Table_of_Contents">Table of Contents
 IntroductionInstallationServlet ConfigurationFilter ConfigurationDirectivesVariables
 Introduction
 

Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/ssl-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/ssl-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-8.5-doc/ssl-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-8.5-doc/ssl-howto.html Tue Mar 27 20:24:04 
2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 8
   Version 8.5.29,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesSSL/TLS Configuration HOW-TOTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) 

svn commit: r1827867 [17/17] - in /tomcat/site/trunk/docs: tomcat-7.0-doc/ tomcat-8.0-doc/ tomcat-8.5-doc/ tomcat-9.0-doc/

[fschumacher]

Modified: tomcat/site/trunk/docs/tomcat-9.0-doc/ssi-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/ssi-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/ssi-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/ssi-howto.html Tue Mar 27 20:24:04 
2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 9
   Version 9.0.6,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesSSI How ToTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) Windows Authentication32) Tomcat's JDBC Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat DevelopmentBuildinghref="changelog.html">Changeloghref="http://wiki.apache.org/tomcat/TomcatVersions;>Statushref="developers.html">Developershref="architecture/index.html">Architecturehref="funcspecs/index.html">Functional Specs.href="tribes/introduction.html">Tribes id="mainRight">SSI How Toid="Table_of_Contents">Table of Contents
 IntroductionInstallationServlet ConfigurationFilter ConfigurationDirectivesVariables
 Introduction
 

Modified: tomcat/site/trunk/docs/tomcat-9.0-doc/ssl-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/ssl-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/ssl-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/ssl-howto.html Tue Mar 27 20:24:04 
2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 9
   Version 9.0.6,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesSSL/TLS Configuration HOW-TOTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) Windows 

svn commit: r1827867 [15/17] - in /tomcat/site/trunk/docs: tomcat-7.0-doc/ tomcat-8.0-doc/ tomcat-8.5-doc/ tomcat-9.0-doc/

[fschumacher]

Modified: tomcat/site/trunk/docs/tomcat-9.0-doc/host-manager-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/host-manager-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/host-manager-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/host-manager-howto.html Tue Mar 27 
20:24:04 2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 9
   Version 9.0.6,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesHost Manager App -- Text 
InterfaceTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) Windows Authentication32) Tomcat's JDBC Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat DevelopmentBuildinghref="changelog.html">Changeloghref="http://wiki.apache.org/tomcat/TomcatVersions;>Statushref="developers.html">Developershref="architecture/index.html">Architecturehref="funcspecs/index.html">Functional Specs.href="tribes/introduction.html">Tribes id="mainRight">Host Manager App -- Text 
 >InterfaceTable of Contentsclass="text">
   IntroductionConfiguring Manager Application 
AccessList of CommandsList commandAdd 
commandRemove commandStart commandStop 
commandPersist 
command
 Introduction
   

Modified: tomcat/site/trunk/docs/tomcat-9.0-doc/html-host-manager-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/html-host-manager-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/html-host-manager-howto.html 
(original)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/html-host-manager-howto.html Tue Mar 
27 20:24:04 2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 9
   Version 9.0.6,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesHost Manager App -- HTML 
InterfaceTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load 

svn commit: r1827867 [11/17] - in /tomcat/site/trunk/docs: tomcat-7.0-doc/ tomcat-8.0-doc/ tomcat-8.5-doc/ tomcat-9.0-doc/

[fschumacher]

Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/host-manager-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/host-manager-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-8.5-doc/host-manager-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-8.5-doc/host-manager-howto.html Tue Mar 27 
20:24:04 2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 8
   Version 8.5.29,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesHost Manager App -- Text 
InterfaceTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) Security Considerations30) Windows Service31) Windows Authentication32) Tomcat's JDBC Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat DevelopmentBuildinghref="changelog.html">Changeloghref="http://wiki.apache.org/tomcat/TomcatVersions;>Statushref="developers.html">Developershref="architecture/index.html">Architecturehref="funcspecs/index.html">Functional Specs.href="tribes/introduction.html">Tribes id="mainRight">Host Manager App -- Text 
 >InterfaceTable of Contentsclass="text">
   IntroductionConfiguring Manager Application 
AccessList of CommandsList commandAdd 
commandRemove commandStart commandStop 
commandPersist 
command
 Introduction
   

Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/html-host-manager-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/html-host-manager-howto.html?rev=1827867=1827866=1827867=diff
==
--- tomcat/site/trunk/docs/tomcat-8.5-doc/html-host-manager-howto.html 
(original)
+++ tomcat/site/trunk/docs/tomcat-8.5-doc/html-host-manager-howto.html Tue Mar 
27 20:24:04 2018
@@ -31,7 +31,7 @@
 })();
   http://tomcat.apache.org/;>http://www.apache.org/; target="_blank">Apache Tomcat 8
   Version 8.5.29,
-  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20) Load Balancer21) Connectors22) 
Monitoring and Management23) 
Logging24) APR/Native25) Virtual Hosting26) Advanced IO27) 
Additional Components28) Mavenized29) 
Security Considerations30) 
Windows Service31) Windows 
Authentication32) Tomcat's JDBC 
Pool33) WebSocket34) 
RewriteReferenceRelease NotesConfigurationTomcat JavadocsServlet JavadocsJSP 2.3 JavadocsEL 3.0 JavadocsWebSocket 1.1 Javadocshttp://tomcat.apache.org/connectors-doc/;>JK 1.2 
DocumentationApache Tomcat Development
 BuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions;>StatusDevelopersArchitectureFunctional Specs.TribesHost Manager App -- HTML 
InterfaceTable of Contents
+  Mar 5 2018LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ;>FAQUser CommentsUser 
Guide1) Introduction2) Setup3) First 
webapp4) Deployer5) Manager6) Host Manager7) Realms and AAA8) Security Manager9) JNDI Resources10) JDBC DataSources11) 
Classloading12) JSPs13) SSL/TLS14) 
SSI15) CGI16) Proxy Support17) MBeans Descriptors18) Default Servlet19) Clustering20)