This is an automated email from the ASF dual-hosted git repository.
markt 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 744f17d Language improvements
744f17d is described below
commit 744f17d5458686f0bfb22d210797f29cb99eb332
Author: Mark Thomas <[email protected]>
AuthorDate: Sun May 23 19:43:15 2021 +0100
Language improvements
Identified by https://clcdemo.net/analysis.html?project=tomcat.git
---
java/jakarta/servlet/ServletContext.java | 5 +++--
java/org/apache/catalina/DistributedManager.java | 2 +-
java/org/apache/catalina/Globals.java | 4 ++--
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
java/org/apache/catalina/startup/Constants.java | 3 ++-
java/org/apache/catalina/util/ExtensionValidator.java | 4 ++--
.../catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java | 2 +-
webapps/docs/appdev/web.xml.txt | 2 +-
webapps/docs/graal.xml | 2 +-
9 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index 38dd583..3a7e2b1 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -425,8 +425,9 @@ public interface ServletContext {
* parameter does not exist.
* <p>
* This method can make available configuration information useful to an
- * entire "web application". For example, it can provide a webmaster's
email
- * address or the name of a system that holds critical data.
+ * entire "web application". For example, it can provide a web site
+ * administrator's email address or the name of a system that holds
critical
+ * data.
*
* @param name
* a <code>String</code> containing the name of the parameter
diff --git a/java/org/apache/catalina/DistributedManager.java
b/java/org/apache/catalina/DistributedManager.java
index 561c488..612ebbe 100644
--- a/java/org/apache/catalina/DistributedManager.java
+++ b/java/org/apache/catalina/DistributedManager.java
@@ -25,7 +25,7 @@ import java.util.Set;
* BackupManager is an example of such a Manager as are implementations of the
* StoreManager interface.
* <p>
- * With the BackupManager, sessions can be primary (master copy on this node),
+ * With the BackupManager, sessions can be primary (primary copy on this node),
* backup (backup copy on this node) or proxy (only the session ID on this
* node). The identity of the primary and backup nodes are known for all
* sessions, including proxy sessions.
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index d2e8698..916dd38 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -271,8 +271,8 @@ public final class Globals {
// -------------------------------------------------------- Global
constants
/**
- * The master flag which controls strict servlet specification
- * compliance.
+ * The flag which controls strict servlet specification compliance. Setting
+ * this flag to {@code true} will change the defaults for other settings.
*/
public static final boolean STRICT_SERVLET_COMPLIANCE =
Boolean.parseBoolean(System.getProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
"false"));
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index cff8f88..8e68575 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -364,7 +364,7 @@ public class DefaultServlet extends HttpServlet {
useAcceptRanges =
Boolean.parseBoolean(getServletConfig().getInitParameter("useAcceptRanges"));
}
- // Sanity check on the specified buffer sizes
+ // Prevent the use of buffer sizes that are too small
if (input < 256) {
input = 256;
}
diff --git a/java/org/apache/catalina/startup/Constants.java
b/java/org/apache/catalina/startup/Constants.java
index 07a6e07..2b84142 100644
--- a/java/org/apache/catalina/startup/Constants.java
+++ b/java/org/apache/catalina/startup/Constants.java
@@ -38,7 +38,8 @@ public final class Constants {
public static final String WarTracker = "/META-INF/war-tracker";
/**
- * A dummy value used to suppress loading the default web.xml file.
+ * A value that points to a non-existent file used to suppress loading the
+ * default web.xml file.
*
* <p>
* It is useful when embedding Tomcat, when the default configuration is
diff --git a/java/org/apache/catalina/util/ExtensionValidator.java
b/java/org/apache/catalina/util/ExtensionValidator.java
index 2d0975d..772f705 100644
--- a/java/org/apache/catalina/util/ExtensionValidator.java
+++ b/java/org/apache/catalina/util/ExtensionValidator.java
@@ -37,8 +37,8 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Ensures that all extension dependencies are resolved for a WEB application
- * are met. This class builds a master list of extensions available to an
- * application and then validates those extensions.
+ * are met. This class builds a list of extensions available to an application
+ * and then validates those extensions.
*
* See http://docs.oracle.com/javase/1.4.2/docs/guide/extensions/spec.html
* for a detailed explanation of the extension mechanism in Java.
diff --git
a/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
b/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
index 4c26933..c034775 100644
---
a/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
+++
b/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
@@ -121,7 +121,7 @@ public class TestSSOnonLoginAndBasicAuthenticator extends
TomcatBaseTest {
private String encodedURL;
/*
- * Run some sanity checks without an established SSO session
+ * Run some checks without an established SSO session
* to make sure the test environment is correct.
*/
@Test
diff --git a/webapps/docs/appdev/web.xml.txt b/webapps/docs/appdev/web.xml.txt
index b560a73..8f07916 100644
--- a/webapps/docs/appdev/web.xml.txt
+++ b/webapps/docs/appdev/web.xml.txt
@@ -53,7 +53,7 @@
-->
<context-param>
- <param-name>webmaster</param-name>
+ <param-name>webadmin</param-name>
<param-value>[email protected]</param-value>
<description>
The EMAIL address of the administrator to whom questions
diff --git a/webapps/docs/graal.xml b/webapps/docs/graal.xml
index 6def03d..c0c804e 100644
--- a/webapps/docs/graal.xml
+++ b/webapps/docs/graal.xml
@@ -71,7 +71,7 @@ cd $JAVA_HOME/bin
<p>
Download the Tomcat Stuffed module from
- https://github.com/apache/tomcat/tree/master/modules/stuffed and place
+ https://github.com/apache/tomcat/tree/main/modules/stuffed and place
all the files in a folder <code>stuffed</code> in this documentation.
<source>export TOMCAT_STUFFED=/absolute...path...to/stuffed</source>
The build process now requires both Ant and Maven.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
