[tomcat] branch main updated: Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators
This is an automated email from the ASF dual-hosted git repository. csutherl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new bf538e1597 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators bf538e1597 is described below commit bf538e1597f0c6474d0962428329c1567619a666 Author: Coty Sutherland AuthorDate: Thu Feb 2 09:01:44 2023 -0500 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators --- java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index 28c4d129cb..4c1f523635 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -1,4 +1,3 @@ -
[tomcat] branch 8.5.x updated: Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators
This is an automated email from the ASF dual-hosted git repository. csutherl 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 945dbdee3b Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators 945dbdee3b is described below commit 945dbdee3b786234491191635f72e48384d11984 Author: Coty Sutherland AuthorDate: Thu Feb 2 09:01:44 2023 -0500 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators --- java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index 28c4d129cb..4c1f523635 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -1,4 +1,3 @@ -
[tomcat] branch 10.1.x updated: Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators
This is an automated email from the ASF dual-hosted git repository. csutherl 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 ece984edc3 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators ece984edc3 is described below commit ece984edc367353dd66dc4cb67f2314e816ed104 Author: Coty Sutherland AuthorDate: Thu Feb 2 09:01:44 2023 -0500 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators --- java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index 28c4d129cb..4c1f523635 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -1,4 +1,3 @@ -
[tomcat] branch 9.0.x updated: Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators
This is an automated email from the ASF dual-hosted git repository. csutherl 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 6c05e1cfb5 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators 6c05e1cfb5 is described below commit 6c05e1cfb5fca9ac99438a284ebd9788743f07b0 Author: Coty Sutherland AuthorDate: Thu Feb 2 09:01:44 2023 -0500 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators --- java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index 28c4d129cb..4c1f523635 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -1,4 +1,3 @@ -
[tomcat] branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 a14251f Fix typo
a14251f is described below
commit a14251f7e46e36dcd24ccb0521649c3877567133
Author: Coty Sutherland
AuthorDate: Wed Apr 22 15:02:19 2020 -0400
Fix typo
---
conf/catalina.policy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/catalina.policy b/conf/catalina.policy
index 51c390f..2e6f8df 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
permission java.security.AllPermission;
};
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
grant codeBase "file:${java.home}/../lib/-" {
permission java.security.AllPermission;
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 666af21 Fix typo
666af21 is described below
commit 666af217f229358f6f7874513b6c3e3ab4249356
Author: Coty Sutherland
AuthorDate: Wed Apr 22 15:02:19 2020 -0400
Fix typo
---
conf/catalina.policy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/catalina.policy b/conf/catalina.policy
index 4168720..3e16824 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
permission java.security.AllPermission;
};
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
grant codeBase "file:${java.home}/../lib/-" {
permission java.security.AllPermission;
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 c08e04f Fix typo
c08e04f is described below
commit c08e04fdfbbaad920528a02ba236f23f80d27044
Author: Coty Sutherland
AuthorDate: Wed Apr 22 15:02:19 2020 -0400
Fix typo
---
conf/catalina.policy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/catalina.policy b/conf/catalina.policy
index e5b2e92..4a5af06 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
permission java.security.AllPermission;
};
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
grant codeBase "file:${java.home}/../lib/-" {
permission java.security.AllPermission;
};
-
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
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 4d94096 Fix typo
4d94096 is described below
commit 4d940963dae60f42d5b918d8e5a7a9b997db84f2
Author: Coty Sutherland
AuthorDate: Wed Apr 22 15:02:19 2020 -0400
Fix typo
---
conf/catalina.policy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/catalina.policy b/conf/catalina.policy
index 51c390f..2e6f8df 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -39,7 +39,7 @@ grant codeBase "file:${java.home}/jre/lib/ext/-" {
permission java.security.AllPermission;
};
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre
+// These permissions apply to javac when ${java.home} points at $JAVA_HOME/jre
grant codeBase "file:${java.home}/../lib/-" {
permission java.security.AllPermission;
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1867771 - /tomcat/site/trunk/xdocs/presentations.xml
Author: csutherl Date: Mon Sep 30 12:35:23 2019 New Revision: 1867771 URL: http://svn.apache.org/viewvc?rev=1867771=rev Log: Add slide links for Coty Modified: tomcat/site/trunk/xdocs/presentations.xml Modified: tomcat/site/trunk/xdocs/presentations.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1867771=1867770=1867771=diff == --- tomcat/site/trunk/xdocs/presentations.xml (original) +++ tomcat/site/trunk/xdocs/presentations.xml Mon Sep 30 12:35:23 2019 @@ -49,6 +49,7 @@ mailing list. Tips for Debugging Tomcat and Web Applications - Coty Sutherland, +https://people.apache.org/~csutherl/ApacheCon%20NA%202019/Tips%20for%20Debugging%20Tomcat%20and%20Web%20Applications%20(2019).pdf">slides, https://www.youtube.com/watch?v=taKWjPeIbIM;>video @@ -71,6 +72,7 @@ mailing list. Packaging Tomcat for Linux Distributions - Coty Sutherland, +https://people.apache.org/~csutherl/ApacheCon%20NA%202019/Packaging%20Tomcat%20for%20Linux%20Distributions%20(2019).pdf">slides, https://www.youtube.com/watch?v=yyx5e83DOgc;>video - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Revert "Use https instead of http" :(
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 4ef8148 Revert "Use https instead of http" :(
4ef8148 is described below
commit 4ef814827cbb1401a324b4785f0e80bae8656103
Author: Coty Sutherland
AuthorDate: Tue May 21 08:13:10 2019 -0400
Revert "Use https instead of http" :(
This reverts commit beb2dca83bb4084432fd3b44e06973730ad4dc7d.
---
build.properties.default | 10 +-
build.xml| 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index cc217b6..1bacc19 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -90,7 +90,7 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
+base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
@@ -126,8 +126,8 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
#
# Checksum is from "SHA512 Checksums for 4.10" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
+#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
#
jdt.version=4.10
jdt.release=R-4.10-201812060815
@@ -137,8 +137,8 @@
jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
tomcat-native.version=1.2.21
diff --git a/build.xml b/build.xml
index 4d76077..6e91e91 100644
--- a/build.xml
+++ b/build.xml
@@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
- https://docs.oracle.com/javase/8/docs/api/"/>
+ http://docs.oracle.com/javase/8/docs/api/"/>
https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
https://javaee.github.io/javaee-spec/javadocs/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Use https instead of http
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 beb2dca Use https instead of http
beb2dca is described below
commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
Author: Coty Sutherland
AuthorDate: Tue May 21 08:01:53 2019 -0400
Use https instead of http
---
build.properties.default | 10 +-
build.xml| 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1bacc19..cc217b6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -90,7 +90,7 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
+base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
@@ -126,8 +126,8 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
#
# Checksum is from "SHA512 Checksums for 4.10" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
-#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
#
jdt.version=4.10
jdt.release=R-4.10-201812060815
@@ -137,8 +137,8 @@
jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
tomcat-native.version=1.2.21
diff --git a/build.xml b/build.xml
index 6e91e91..4d76077 100644
--- a/build.xml
+++ b/build.xml
@@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
- http://docs.oracle.com/javase/8/docs/api/"/>
+ https://docs.oracle.com/javase/8/docs/api/"/>
https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
https://javaee.github.io/javaee-spec/javadocs/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update proxy-howto to remove old httpd versions references
This is an automated email from the ASF dual-hosted git repository. csutherl 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 0acd169 Update proxy-howto to remove old httpd versions references 0acd169 is described below commit 0acd169efb8f6320de21065ba873358d3a3d7304 Author: Coty Sutherland AuthorDate: Thu Apr 18 16:44:34 2019 -0400 Update proxy-howto to remove old httpd versions references --- webapps/docs/proxy-howto.xml | 22 +- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/webapps/docs/proxy-howto.xml b/webapps/docs/proxy-howto.xml index b91dbdd..704dcd8 100644 --- a/webapps/docs/proxy-howto.xml +++ b/webapps/docs/proxy-howto.xml @@ -63,13 +63,14 @@ proxy configurations for several common cases. - - -Apache 1.3 supports an optional module (mod_proxy) that -configures the web server to act as a proxy server. This can be used to -forward requests for a particular web application to a Tomcat instance, -without having to configure a web connector such as mod_jk. -To accomplish this, you need to perform the following tasks: + + +Apache httpd 1.3 and later versions support an optional module +(mod_proxy) that configures the web server to act as a proxy +server. This can be used to forward requests for a particular web application +to a Tomcat instance, without having to configure a web connector such as +mod_jk. To accomplish this, you need to perform the following +tasks: Configure your copy of Apache so that it includes the mod_proxy module. If you are building from source, @@ -80,7 +81,7 @@ To accomplish this, you need to perform the following tasks: mod_proxy module at Apache startup time, by using the following directives in your httpd.conf file: +]]> Include two directives in your httpd.conf file for each web application that you wish to forward to Tomcat. For example, to forward an application at context path /myapp: @@ -139,11 +140,6 @@ within the web application's deployment descriptor - -The same instructions hold true as for 1.3. (Except in Apache 2.0, -you may omit AddModule mod_proxy.c) - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Clarify SSL Configuration attributes in JmxRemoteLifecycleListener documentation
This is an automated email from the ASF dual-hosted git repository. csutherl 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 9a3cc79 Clarify SSL Configuration attributes in JmxRemoteLifecycleListener documentation 9a3cc79 is described below commit 9a3cc792463569487d288386472a66c95057be8c Author: Coty Sutherland AuthorDate: Thu Apr 18 15:18:43 2019 -0400 Clarify SSL Configuration attributes in JmxRemoteLifecycleListener documentation --- webapps/docs/config/listeners.xml | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/webapps/docs/config/listeners.xml b/webapps/docs/config/listeners.xml index e488f82..983793b 100644 --- a/webapps/docs/config/listeners.xml +++ b/webapps/docs/config/listeners.xml @@ -511,15 +511,6 @@ visualvm or a similar tool to a remote Tomcat instance that is running behind a firewall. -Note: The SSL configuration can be done with attributes identical to those -of SSLHostConfig and the -properties of the default certificate as defined for -SSLHostConfigCertificate. -This will create a JSSE SSLContext which will be given to the JMX/RMI registry -when creating the server socket. OpenSSL specific attributes cannot -be used in the configuration as JMX remote can only use a regular -SSLContext. - The remainder of the configuration can be done via the standard system properties for configuring JMX. For further information on configuring JMX see @@ -531,7 +522,8 @@ element. The following additional attributes are supported by the JMX Remote -Lifecycle Listener, in addition to the SSL related attributes: +Lifecycle Listener, in addition to the SSL related attributes noted below +in the "SSL Configurations" section: @@ -619,7 +611,16 @@ letmein. -SSL configurations +SSL Configurations + +Note: SSL configuration can be done with attributes identical to those +of SSLHostConfig and the +properties of the default certificate as defined for +SSLHostConfigCertificate. +This will create a JSSE SSLContext which will be given to the JMX/RMI registry +when creating the server socket. OpenSSL specific attributes cannot + be used in the configuration as JMX remote can only use a regular +SSLContext. A certificate can be defined for the server using a keystore:
[tomcat] branch master updated: Update ServerInfo to reflect actual information instead of placeholders when running development builds
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 c8748aa Update ServerInfo to reflect actual information instead of
placeholders when running development builds
c8748aa is described below
commit c8748aaf9f3f7bc9f38c5805ed80e1a333696216
Author: Coty Sutherland
AuthorDate: Thu Apr 11 15:45:55 2019 -0400
Update ServerInfo to reflect actual information instead of placeholders
when running development builds
---
java/org/apache/catalina/util/ServerInfo.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/util/ServerInfo.java
b/java/org/apache/catalina/util/ServerInfo.java
index 020d926..a70b5bf 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -68,11 +68,11 @@ public class ServerInfo {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
-if (info == null)
-info = "Apache Tomcat 9.0.x-dev";
-if (built == null)
+if (info == null || info.equals("Apache Tomcat/@VERSION@"))
+info = "Apache Tomcat/9.0.x-dev";
+if (built == null || built.equals("@VERSION_BUILT@"))
built = "unknown";
-if (number == null)
+if (number == null || number.equals("@VERSION_NUMBER@"))
number = "9.0.x";
serverInfo = info;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix service.bat references in instructions
This is an automated email from the ASF dual-hosted git repository. csutherl 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 bfc4c38 Fix service.bat references in instructions bfc4c38 is described below commit bfc4c383ec2a12b10a693a42281caf4c3f34661d Author: Coty Sutherland AuthorDate: Mon Apr 8 14:54:29 2019 -0400 Fix service.bat references in instructions --- webapps/docs/windows-service-howto.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index 7d74126..d3c69b9 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -457,22 +457,22 @@ update the port number so as to specify a unique IP/port combination. To install an instance, first set the CATALINA_HOME environment variable to the name of the Tomcat installation directory. Then create a second environment -variable CATALINA_BASE and point this to the instance folder. Then run "service -install" command specifying a service name. +variable CATALINA_BASE and point this to the instance folder. Then run +"service.bat install" command specifying a service name. set CATALINA_HOME=c:\tomcat_ set CATALINA_BASE=c:\tomcat_\instances\instance1 -service install instance1 +service.bat install instance1 To modify the service settings, you can run tomcatw //ES//instance1. For additional instances, create additional instance folder, update the -CATALINA_BASE environment variable, and run the service install again. +CATALINA_BASE environment variable, and run the "service.bat install" again. set CATALINA_BASE=c:\tomcat_\instances\instance2 -service install instance2 +service.bat install instance2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch wrong-http2-version deleted (was 0e1de0d)
This is an automated email from the ASF dual-hosted git repository. csutherl pushed a change to branch wrong-http2-version in repository https://gitbox.apache.org/repos/asf/tomcat.git. was 0e1de0d Fix wrong protocol version usage The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update BUILDING and CONTRIBUTING docs after the svn->git migration
This is an automated email from the ASF dual-hosted git repository. csutherl 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 f1cc7fc Update BUILDING and CONTRIBUTING docs after the svn->git migration new 5e28428 Merge pull request #141 from csutherl/master f1cc7fc is described below commit f1cc7fcefa844b13622812e9fd875b18f68b0df7 Author: Coty Sutherland AuthorDate: Fri Mar 1 13:50:03 2019 -0500 Update BUILDING and CONTRIBUTING docs after the svn->git migration --- BUILDING.txt| 10 +- CONTRIBUTING.md | 47 ++- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 77fd6c8..331184a 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -93,13 +93,13 @@ source distribution, do the following: (3.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@ -Checkout the source using SVN, selecting a tag for released version or -trunk for the current development code, or download and unpack a source +Clone the source using git, then checkout a specific major branch or +master for the latest code development, or download and unpack a source package. - * Tomcat SVN repository URL: + * Tomcat GitHub repository URL: - https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/ +https://github.com/apache/tomcat * Source packages can be downloaded from: @@ -184,7 +184,7 @@ each release package has the appropriate line-endings. (4) Updating sources and rebuilding It is recommended that you regularly update the downloaded Tomcat @VERSION_MAJOR_MINOR@ -sources using your SVN client. +sources using your git client. For a quick rebuild of only modified code you can use: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a13c5c9..74eac26 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing to Apache Tomcat Firstly, thanks for your interest in contributing! I hope that this will be a -pleasant first experience for you, and that you will return to continue +pleasant experience for you, and that you will return to continue contributing. Please visit our [Get Involved page](https://tomcat.apache.org/getinvolved.html) @@ -38,12 +38,12 @@ the issues marked 'Beginner', link below. Please note that the Beginner keyword is pretty new to the project, so if there aren't any issues in the filter feel free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev). -* [Beginner issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW_status=ASSIGNED_status=REOPENED_status=NEEDINFO=Beginner_type=allwords_id=160824=Tomcat%207=Tomcat%208=Tomcat%209_format=advanced) - +* [Beginner issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW_status=ASSIGNED_status=REOPENED_status=NEEDINFO=Beginner_type=allwords_id=160824=Tomcat%207=Tomcat%208.5=Tomcat%209_format=advanced) - issues which should only require a few lines of code, and a test or two to resolve. The list above shows all bugs that are marked 'Beginner' and are open in the -currently supported Tomcat versions (7, 8, and 9). +currently supported Tomcat versions (7, 8.5, and 9). If you prefer C over Java, you may also take a look at the tomcat-native and Tomcat Connectors products in Bugzilla. @@ -57,11 +57,8 @@ committers of the project for review and acceptance. You can provide a patch in one of the following ways (in order of preference): +* GitHub Pull Request * Patch attachment to the Bugzilla issue -* Github Pull Request -> **Note:** Github is a mirror of the SVN repository that Tomcat is stored in -and therefore it can't be merged outright. Your contribution will be converted -into an SVN patch and committed with a mention of your name for credit. * Email the patch to the developer list. This is not preferred, but if no bug is associated with the patch, or you would like a developer review, an email may be appropriate. @@ -73,51 +70,43 @@ source code. ## Download The Source Distribution -This method works if you want to submit a patch (like you would do for SVN), but +This method works if you want to submit a patch via email, but the difference in using the sources distribution and a VCS is that you have to manually generate the patch file by using diff. If this is what you want, you can download the sources from the "Source Code Distributions" section of the Download Page. There is one such page for every major Tomcat version: + - [Tomcat 9](https://tomcat.apache.org/download-90.cgi) - [Tomcat 8](https://tomcat.apache.org/download-80.cgi) - [Tomcat 7](https://tomcat.apache.org/download-70.cgi) -## SVN +# Manual Patch Generation If you have chosen to attach a patch to the Bugzilla issue (or email -one), then you'll need to check
[tomcat] branch master updated: Correct grammatical error
This is an automated email from the ASF dual-hosted git repository.
csutherl 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 3f418c7 Correct grammatical error
3f418c7 is described below
commit 3f418c748eb62475d63faab1f0dc014ef301fa71
Author: Coty Sutherland
AuthorDate: Fri Mar 1 13:21:12 2019 -0500
Correct grammatical error
---
java/org/apache/catalina/filters/CorsFilter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 35ed49c..4db1f87 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -752,7 +752,7 @@ public class CorsFilter extends GenericFilter {
this.exposedHeaders.clear();
this.exposedHeaders.addAll(setExposedHeaders);
-// For any value other then 'true' this will be false.
+// For any value other than 'true' this will be false.
this.supportsCredentials = Boolean.parseBoolean(supportsCredentials);
if (this.supportsCredentials && this.anyOriginAllowed) {
@@ -770,7 +770,7 @@ public class CorsFilter extends GenericFilter {
sm.getString("corsFilter.invalidPreflightMaxAge"), e);
}
-// For any value other then 'true' this will be false.
+// For any value other than 'true' this will be false.
this.decorateRequest = Boolean.parseBoolean(decorateRequest);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1851494 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java java/org/apache/catalina/connector/LocalStrings.properties java/org/apache/catalina/core/AprLifecycleListener
Author: csutherl
Date: Thu Jan 17 02:25:03 2019
New Revision: 1851494
URL: http://svn.apache.org/viewvc?rev=1851494=rev
Log:
Log a message when using a Connector that requires Apr without enabling the
AprLifecycleListener first
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Jan 17
02:25:03 2019
@@ -957,8 +957,12 @@ public class Connector extends Lifecycle
setParseBodyMethods(getParseBodyMethods());
}
+if (protocolHandler.isAprRequired() &&
!AprLifecycleListener.isInstanceCreated()) {
+throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener",
+getProtocolHandlerClassName()));
+}
if (protocolHandler.isAprRequired() &&
!AprLifecycleListener.isAprAvailable()) {
-throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr",
+throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary",
getProtocolHandlerClassName()));
}
if (AprLifecycleListener.isAprAvailable() &&
AprLifecycleListener.getUseOpenSSL() &&
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
[UTF-8] Thu Jan 17 02:25:03 2019
@@ -29,7 +29,8 @@ coyoteConnector.parseBodyMethodNoTrace=T
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler
initialization failed
coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler
instantiation failed
-coyoteConnector.protocolHandlerNoApr=The configured protocol [{0}] requires
the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}]
requires the AprLifecycleListener which is not available
+coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}]
requires the APR/native library which is not available
coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu
Jan 17 02:25:03 2019
@@ -421,4 +421,8 @@ public class AprLifecycleListener
return useOpenSSL;
}
+public static boolean isInstanceCreated() {
+return instanceCreated;
+}
+
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 17 02:25:03 2019
@@ -84,6 +84,10 @@
Correct a bug exposed in 9.0.14 and ensure that the Tomcat terminates
in
a timely manner when running as a service. (markt)
+
+Log a message when using a Connector that requires Apr without enabling
+the AprLifecycleListener first. (csutherl)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1850977 [8/8] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ refe
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html?rev=1850977=1850976=1850977=diff == --- tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html (original) +++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html Thu Jan 10 20:17:16 2019 @@ -29,7 +29,7 @@ })(window, document); }), false); })(); - http://tomcat.apache.org/;>https://www.apache.org/; target="_blank">The Apache Tomcat Connectors - Web Server HowToLinksDocs HomeCommon HowToFor the impatientAll about workersTimeouts Load BalancingReverse ProxyWeb Server HowToApache HTTP Server (mod_jk)Microsoft IIS (ISAPI redirector)iPlanet Web Server (NSAPI redirector)Reference Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI redirector)AJP Protocol ReferenceAJPv13 (ajp13)AJPv13 Extension ProposalMiscellaneous D ocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advancedshort_desc_type=allwordssubstrshort_desc=product=Tomcat+Connectorslong_desc_type=substringlong_desc=bug_file_loc_type=allwordssubstrbug_file_loc=keywords_type=allwordskeywords=bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemailassigned_to1=1emailtype1=substringemail1=emailassigned_to2=1emailreporter2=1emailcc2=1emailtype2=substringemail2=bugidtype=includebug_id=votes=chfieldfrom=chfieldto=Nowchfieldvalue=cmdtype=doitorder=Reuse+same+sort+as+last+timefield0-0-0=nooptype0-0-0=noopvalue0-0-0=;>Current Tomcat Connectors bugsContribute doc umentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html;>Old JK/JK2 documentationNews2018201620152014201220112010200920082007200620052004ISAPI redirector for Micrsoft IIS HowToid="Introduction">Introduction + http://tomcat.apache.org/;>https://www.apache.org/; target="_blank">The Apache Tomcat Connectors - Web Server HowToLinksDocs HomeCommon HowToQuick StartAll About WorkersTimeoutsLoad B alancingReverse ProxyWeb Server HowToApache HTTP Server (mod_jk)Microsoft IIS (ISAPI redirector)iPlanet Web Server (NSAPI redirector)Reference Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI redirector)AJP Protocol ReferenceAJPv13 (ajp13)AJPv13 Extension ProposalMiscellaneous Documen tationFrequently Asked QuestionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advancedshort_desc_type=allwordssubstrshort_desc=product=Tomcat+Connectorslong_desc_type=substringlong_desc=bug_file_loc_type=allwordssubstrbug_file_loc=keywords_type=allwordskeywords=bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemailassigned_to1=1emailtype1=substringemail1=emailassigned_to2=1emailreporter2=1emailcc2=1emailtype2=substringemail2=bugidtype=includebug_id=votes=chfieldfrom=chfieldto=Nowchfieldvalue=cmdtype=doitorder=Reuse+same+sort+as+last+timefield0-0-0=nooptype0-0-0=noopvalue0-0-0=;>Current Tomcat Connectors bugsContribute documenta tionJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html;>Old JK/JK2 documentationNews2018201620152014201220112010200920082007200620052004ISAPI redirector for Micrsoft IIS HowToIntroduction This document explains how to set up the ISAPI redirector for IIS to cooperate with Tomcat. Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/nes.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/nes.html?rev=1850977=1850976=1850977=diff == --- tomcat/site/trunk/docs/connectors-doc/webserver_howto/nes.html (original) +++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/nes.html Thu Jan 10 20:17:16 2019 @@ -1,5 +1,5 @@ -The Apache Tomcat Connectors - Web Server HowTo (1.2.x) - Planet web server HowTo +The Apache Tomcat Connectors - Web Server HowTo (1.2.x) - iPlanet Web Server HowTo