[tomcat] branch 7.0.x updated (809d6a9 -> 09e80f5)

classic Classic list List threaded Threaded
16 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch 7.0.x updated (809d6a9 -> 09e80f5)

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

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


    from 809d6a9  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737
     new f855be6  Add missing Javadoc
     new bee66a9  fix typo
     new c711162  fix typo
     new eaf3017  fix typo
     new 44c263d  fix typo
     new 91bc1b2  Remove unused i18n messages (removal of translations to follow)
     new 19f92c1  Fix typo
     new 654cacb  fix typo
     new 71aa3a9  fix typo
     new 035187b  Fix typo
     new fcca962  fix typo (an ssl)
     new 1177ce9  fix typo(an sql)
     new f39f001  Fix typo
     new 09a1756  Fix typo
     new 09e80f5  Update changelog for PR from KangZhiDong

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 conf/server.xml                                                   | 2 +-
 java/javax/servlet/http/HttpServletRequest.java                   | 2 +-
 java/javax/servlet/resources/web-app_2_5.xsd                      | 2 +-
 java/javax/servlet/resources/web-common_3_0.xsd                   | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java          | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java          | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java   | 2 +-
 java/org/apache/catalina/ant/jmx/package.html                     | 4 ++--
 java/org/apache/catalina/connector/Request.java                   | 2 +-
 java/org/apache/catalina/filters/CorsFilter.java                  | 2 +-
 java/org/apache/catalina/filters/LocalStrings.properties          | 4 ++--
 java/org/apache/catalina/ha/session/BackupManager.java            | 2 +-
 java/org/apache/catalina/loader/LocalStrings.properties           | 2 --
 java/org/apache/catalina/manager/LocalStrings_ru.properties       | 1 -
 java/org/apache/catalina/realm/JDBCRealm.java                     | 6 +++---
 java/org/apache/catalina/realm/LocalStrings.properties            | 2 +-
 java/org/apache/catalina/security/SecurityUtil.java               | 1 +
 java/org/apache/catalina/ssi/ResponseIncludeWrapper.java          | 2 +-
 java/org/apache/catalina/startup/LocalStrings.properties          | 3 ---
 java/org/apache/catalina/util/SessionIdGeneratorBase.java         | 2 +-
 java/org/apache/coyote/ajp/Constants.java                         | 2 +-
 java/org/apache/jasper/compiler/ELFunctionMapper.java             | 2 +-
 java/org/apache/jasper/compiler/JspConfig.java                    | 2 +-
 java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java   | 4 ++--
 java/org/apache/jasper/resources/LocalStrings.properties          | 1 -
 java/org/apache/tomcat/jni/SSL.java                               | 2 +-
 java/org/apache/tomcat/jni/SSLContext.java                        | 6 +++---
 java/org/apache/tomcat/jni/SSLSocket.java                         | 6 +++---
 java/org/apache/tomcat/util/digester/package.html                 | 4 ++--
 java/org/apache/tomcat/util/http/FastHttpDateFormat.java          | 4 ++--
 java/org/apache/tomcat/util/http/parser/Host.java                 | 4 ++--
 java/org/apache/tomcat/util/http/parser/LocalStrings.properties   | 1 -
 java/org/apache/tomcat/util/modeler/Registry.java                 | 4 ++--
 java/org/apache/tomcat/util/modeler/RegistryMBean.java            | 2 +-
 java/org/apache/tomcat/util/modeler/package.html                  | 2 +-
 java/org/apache/tomcat/util/net/NioChannel.java                   | 2 +-
 java/org/apache/tomcat/util/net/SecureNioChannel.java             | 2 +-
 java/org/apache/tomcat/websocket/LocalStrings.properties          | 1 -
 java/org/apache/tomcat/websocket/server/LocalStrings.properties   | 3 ---
 java/org/apache/tomcat/websocket/server/UpgradeUtil.java          | 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml                               | 2 +-
 .../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java  | 4 ++--
 .../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java  | 2 +-
 .../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml  | 4 ++--
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java       | 2 +-
 webapps/docs/architecture/startup/serverStartup.txt               | 2 +-
 webapps/docs/changelog.xml                                        | 8 ++++++++
 webapps/docs/config/ajp.xml                                       | 2 +-
 webapps/docs/config/cluster-valve.xml                             | 2 +-
 webapps/docs/config/http.xml                                      | 2 +-
 webapps/docs/connectors.xml                                       | 2 +-
 webapps/docs/funcspecs/index.xml                                  | 2 +-
 webapps/docs/mbeans-descriptors-howto.xml                         | 2 +-
 webapps/docs/ssl-howto.xml                                        | 8 ++++----
 54 files changed, 72 insertions(+), 75 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/15: Add missing Javadoc

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

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

commit f855be694a58167bfcdee8e5259bb97aeb8365a8
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 15:20:01 2019 +0100

    Add missing Javadoc
---
 java/org/apache/catalina/security/SecurityUtil.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/catalina/security/SecurityUtil.java b/java/org/apache/catalina/security/SecurityUtil.java
index ed5ff3a..046b78a 100644
--- a/java/org/apache/catalina/security/SecurityUtil.java
+++ b/java/org/apache/catalina/security/SecurityUtil.java
@@ -94,6 +94,7 @@ public final class SecurityUtil{
      * @param methodName the method to apply the security restriction
      * @param targetObject the <code>Servlet</code> on which the method will
      * be called.
+     * @throws Exception an execution error occurred
      */
     public static void doAsPrivilege(final String methodName,
                                      final Servlet targetObject) throws Exception {


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 02/15: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit bee66a907da6b4d093c8b056766cf770c297f8b4
Author: kangzhidong <[hidden email]>
AuthorDate: Wed Aug 21 23:59:54 2019 +0800

    fix typo
---
 java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java        | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java        | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +-
 java/org/apache/catalina/ant/jmx/package.html                   | 4 ++--
 java/org/apache/tomcat/util/modeler/package.html                | 2 +-
 webapps/docs/mbeans-descriptors-howto.xml                       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index 93b51a0..10ae4fd 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException;
  * <p>
  * Examples:
  * <br>
- * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
+ * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
  * </p>
  * <pre>
  *   &lt;jmx:get
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index c5b9a97..d8140ed 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException;
  * </ul>
  * <p>
  * Examples:
- * Set a Mbean Manager attribute maxActiveSessions.
+ * Set an Mbean Manager attribute maxActiveSessions.
  * Set this attribute with fresh jmx connection without save reference
  * </p>
  * <pre>
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
index 07f4597..7b5aa51 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
@@ -22,7 +22,7 @@ import javax.management.ObjectName;
 import org.apache.tools.ant.BuildException;
 
 /**
- * unregister a MBean at <em>JMX</em> JSR 160 MBeans Server.
+ * unregister an MBean at <em>JMX</em> JSR 160 MBeans Server.
  * <ul>
  * <li>unregister Mbeans</li>
  * </ul>
diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html
index 8b2c6dd..41ecc63 100644
--- a/java/org/apache/catalina/ant/jmx/package.html
+++ b/java/org/apache/catalina/ant/jmx/package.html
@@ -41,13 +41,13 @@ existing one. The following attribute are exists in every tasks:</p>
   <tr>
     <td>username</td>
     <td>
-      The username of a MBeanServer auth, when configured.
+      The username of an MBeanServer auth, when configured.
     </td>
   </tr>
   <tr>
     <td>password</td>
     <td>
-      The password of a MBeanServer auth, when configured.
+      The password of an MBeanServer auth, when configured.
     </td>
   </tr>
   <tr>
diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html
index a64f08a..c60fb52 100644
--- a/java/org/apache/tomcat/util/modeler/package.html
+++ b/java/org/apache/tomcat/util/modeler/package.html
@@ -215,7 +215,7 @@ registry metadata by hand, using the <code>addManagedBean()</code> and
 the standard support for loading a configuration file to be convenient
 and sufficient.</p>
 
-<p>Modeler will also look for a mbeans-descriptors.xml in the same package
+<p>Modeler will also look for an mbeans-descriptors.xml in the same package
 with the class being registered and in its parent. If no metadata is found,
 modeler will use a number of simple patterns, similar with the ones used by
 ant, to determine a reasonable metadata</p>
diff --git a/webapps/docs/mbeans-descriptors-howto.xml b/webapps/docs/mbeans-descriptors-howto.xml
index aa0e22e..9e4c5ca 100644
--- a/webapps/docs/mbeans-descriptors-howto.xml
+++ b/webapps/docs/mbeans-descriptors-howto.xml
@@ -49,7 +49,7 @@ in order to avoid a "ManagedBean is not found" exception.</p>
 <section name="Adding MBean descriptions">
 
 <p>You may also add MBean descriptions for custom components in
-a mbeans-descriptors.xml file, located in the same package as the class files
+an mbeans-descriptors.xml file, located in the same package as the class files
 it describes.</p>
 
 <p>The permitted syntax for the mbeans-descriptors.xml is defined by


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 03/15: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit c711162f08b4b7f4be8a4f31be6d75bacd4f5fdd
Author: 康智冬 <[hidden email]>
AuthorDate: Sat Aug 24 23:30:23 2019 +0800

    fix typo
   
    fix typo
---
 webapps/docs/funcspecs/index.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/funcspecs/index.xml b/webapps/docs/funcspecs/index.xml
index dfb7f30..4aa1433 100644
--- a/webapps/docs/funcspecs/index.xml
+++ b/webapps/docs/funcspecs/index.xml
@@ -59,7 +59,7 @@ still useful, because it provides an introduction to <strong>what</strong>
 Catalina does, without being as concerned with <strong>how</strong> this is
 accomplished.</p>
 
-<p><strong>TODO</strong> - Obviously, this area has a long ways to go before
+<p><strong>TODO</strong> - Obviously, this area has a long way to go before
 it is complete.  Contributions are welcome!</p>
 
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 04/15: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit eaf3017e5e7022a83d2e6fc9cb937da7bbaac507
Author: kangzhidong <[hidden email]>
AuthorDate: Sat Aug 24 23:41:25 2019 +0800

    fix typo
   
    fix typo
---
 java/org/apache/jasper/compiler/ELFunctionMapper.java           | 2 +-
 java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java | 4 ++--
 java/org/apache/tomcat/util/modeler/Registry.java               | 4 ++--
 java/org/apache/tomcat/util/modeler/RegistryMBean.java          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index cadff84..1381979 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -287,7 +287,7 @@ public class ELFunctionMapper {
         }
 
         /*
-         * @return An unique name for a function mapper.
+         * @return A unique name for a function mapper.
          */
         private String getMapName() {
             return "_jspx_fnmap_" + currFunc++;
diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
index 16ea265..03159ea 100644
--- a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
+++ b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
@@ -37,7 +37,7 @@ public interface TagPluginContext {
     boolean isAttributeSpecified(String attribute);
 
     /**
-     * @return An unique temporary variable name that the plugin can use.
+     * @return A unique temporary variable name that the plugin can use.
      */
     String getTemporaryVariableName();
 
@@ -50,7 +50,7 @@ public interface TagPluginContext {
     /**
      * Generate a declaration in the of the generated class.  This can be
      * used to declare an inner class, a method, or a class variable.
-     * @param id An unique ID identifying the declaration.  It is not
+     * @param id A unique ID identifying the declaration.  It is not
      *           part of the declaration, and is used to ensure that the
      *           declaration will only appear once.  If this method is
      *           invoked with the same id more than once in the translation
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index 1a0aecc..829bc03 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -343,8 +343,8 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
      * and for other operations we want to optimize.
      *
      * @param domain Namespace
-     * @param name  Type of the notification
-     * @return  An unique id for the domain:name combination
+     * @param name Type of the notification
+     * @return A unique id for the domain:name combination
      * @since 1.1
      */
     @Override
diff --git a/java/org/apache/tomcat/util/modeler/RegistryMBean.java b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
index ae256e7..097167c 100644
--- a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
+++ b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
@@ -116,7 +116,7 @@ public interface RegistryMBean {
       *
       * @param domain Namespace
       * @param name  Type of the notification
-      * @return  An unique id for the domain:name combination
+      * @return  A unique id for the domain:name combination
       * @since 1.1
       */
     public int getId( String domain, String name);


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 05/15: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 44c263dc43aaaff21139357be28229c6ca0868d5
Author: kangzhidong <[hidden email]>
AuthorDate: Sun Aug 25 00:12:22 2019 +0800

    fix typo
---
 webapps/docs/architecture/startup/serverStartup.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/architecture/startup/serverStartup.txt b/webapps/docs/architecture/startup/serverStartup.txt
index ba83ddb..1904e82 100644
--- a/webapps/docs/architecture/startup/serverStartup.txt
+++ b/webapps/docs/architecture/startup/serverStartup.txt
@@ -77,7 +77,7 @@ What it does:
         c2) Starts the services under <Server> which are:
             StandardService -> starts Engine (ContainerBase -> Realm,Cluster etc)
         c3) StandardHost (started by the service)
-                Configures a ErrorReportValvem to do proper HTML output for different HTTP
+                Configures an ErrorReportValve to do proper HTML output for different HTTP
                 errors codes
                 Starts the Valves in the pipeline (at least the ErrorReportValve)
                 Configures the StandardHostValve,


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 06/15: Remove unused i18n messages (removal of translations to follow)

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 91bc1b242569349c26f5d7beedbd169afaf5e200
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 15:37:47 2019 +0100

    Remove unused i18n messages (removal of translations to follow)
---
 java/org/apache/catalina/loader/LocalStrings.properties         | 2 --
 java/org/apache/catalina/manager/LocalStrings_ru.properties     | 1 -
 java/org/apache/catalina/startup/LocalStrings.properties        | 3 ---
 java/org/apache/jasper/resources/LocalStrings.properties        | 1 -
 java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 1 -
 java/org/apache/tomcat/websocket/LocalStrings.properties        | 1 -
 java/org/apache/tomcat/websocket/server/LocalStrings.properties | 3 ---
 7 files changed, 12 deletions(-)

diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index 436a7ce..9639ec9 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -52,8 +52,6 @@ webappClassLoader.checkThreadLocalsForLeaksNull=The web application [{0}] create
 webappClassLoader.checkThreadsHttpClient=Found HttpClient keep-alive thread using web application class loader. Fixed by switching thread to the parent class loader.
 webappClassLoader.clearJdbc=The web application [{0}] registered the JDBC driver [{1}] but failed to unregister it when the web application was stopped. To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
 webappClassLoader.clearObjectStreamClassCachesFail=Failed to clear soft references from ObjectStreamClass$Caches for web application [{0}]
-webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}] ResourceBundle references from the cache for web application [{1}]
-webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear ResourceBundle references for web application [{0}]
 webappClassLoader.clearRmi=Found RMI Target with stub class class [{0}] and value [{1}]. This RMI Target has been forcibly removed to prevent a memory leak.
 webappClassLoader.clearRmiFail=Failed to clear context class loader referenced from sun.rmi.transport.Target for web application [{0}]
 webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target to clear context class loader for web application [{0}]. This is expected on non-Sun JVMs.
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index f742471..7e79891 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -162,7 +162,6 @@ managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагр
 managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could not be started
 managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
 managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
-managerServlet.storeConfig.invalidMBean=ОШИБКА - Не удалось найти StoreConfig Mbean
 managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean, зарегистрированный на [{0}]
 managerServlet.threaddump=OK - JVM thread dump
 managerServlet.trustedCertsNotConfigured=Для этого виртуального хоста не настроены доверенные сертификаты безопасности
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index cb76e8e..a405f28 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -32,7 +32,6 @@ contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of cl
 contextConfig.authenticatorMissing=Cannot configure an authenticator for method [{0}]
 contextConfig.authenticatorResources=Cannot load authenticators mapping list
 contextConfig.badUrl=Unable to process context descriptor [{0}]
-contextConfig.baseError=Unable to determine location of global configuration (usually $CATALINA_BASE/conf)
 contextConfig.cce=Lifecycle event data object [{0}] is not a Context
 contextConfig.contextClose=Error closing context.xml
 contextConfig.contextMissing=Missing context.xml: [{0}]
@@ -47,7 +46,6 @@ contextConfig.init=ContextConfig: Initializing
 contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
 contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}] for annotations
 contextConfig.inputStreamJndi=Unable to process resource element [{0}] for annotations
-contextConfig.invalidSci=The ServletContentInitializer [{0}] could not be created
 contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check against the @HandlesTypes annotation of one or more ServletContentInitializers.
 contextConfig.jar=Unable to process resource [{0}] for annotations
 contextConfig.jarFile=Unable to process Jar [{0}] for annotations
@@ -118,7 +116,6 @@ hostConfig.deploying=Deploying discovered web applications
 hostConfig.docBaseUrlInvalid=The provided docBase cannot be expressed as a URL
 hostConfig.expand=Expanding web application archive [{0}]
 hostConfig.expand.error=Exception while expanding web application archive [{0}]
-hostConfig.expanding=Expanding discovered web application archives
 hostConfig.ignorePath=Ignoring path [{0}] in appBase for automatic deployment
 hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be ignored.
 hostConfig.jmx.register=Register context [{0}] failed
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index d21d377..9894d43 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -161,7 +161,6 @@ jsp.error.params.emptyBody=jsp:params must contain at least one nested jsp:param
 jsp.error.params.invalidUse=jsp:params must be a direct child of jsp:plugin
 jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: [{0}]
 jsp.error.parse.xml=XML parsing error on file [{0}]
-jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: [{0}]
 jsp.error.parse.xml.line=XML parsing error on file [{0}]: (line [{1}], col [{2}])
 jsp.error.parse.xml.scripting.invalid.body=Body of [{0}] element must not contain any XML elements
 jsp.error.plugin.badtype=Illegal value for 'type' attribute in jsp:plugin: must be 'bean' or 'applet'
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
index 8af7cc0..e258d30 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
@@ -33,4 +33,3 @@ http.tooFewHextets=An IPv6 address must consist of 8 hextets but this address co
 http.tooManyColons=An IPv6 address may not contain more than 2 sequential colon characters.
 http.tooManyDoubleColons=An IPv6 address may only contain a single '::' sequence.
 http.tooManyHextets=The IPv6 address contains [{0}] hextets but a valid IPv6 address may not have more than 8.
-http.wrongOctetCount=An IPv4 address should have exactly 4 octets, not [{0}].
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 4a5ee08..8507c1a 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -99,7 +99,6 @@ wsSession.duplicateHandlerBinary=A binary message handler has already been confi
 wsSession.duplicateHandlerPong=A pong message handler has already been configured
 wsSession.duplicateHandlerText=A text message handler has already been configured
 wsSession.flushFailOnClose=Failed to flush batched messages on session close
-wsSession.instanceDestroy=Endpoint instance unregistration failed
 wsSession.instanceNew=Endpoint instance registration failed
 wsSession.invalidHandlerTypePong=A pong message handler must implement MessageHandler.Whole
 wsSession.messageFailed=Unable to write the complete message as the WebSocket connection has been closed
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings.properties b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
index c002755..7fad34c 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
@@ -21,9 +21,6 @@ serverContainer.duplicatePaths=Multiple Endpoints may not be deployed to the sam
 serverContainer.encoderFail=Unable to create encoder of type [{0}]
 serverContainer.failedDeployment=Deployment of WebSocket Endpoints to the web application with path [{0}] in host [{1}] is not permitted due to the failure of a previous deployment
 serverContainer.missingAnnotation=Cannot deploy POJO class [{0}] as it is not annotated with @ServerEndpoint
-serverContainer.missingEndpoint=An Endpoint instance has been request for path [{0}] but no matching Endpoint class was found
-serverContainer.pojoDeploy=POJO class [{0}] deploying to path [{1}] in ServletContext [{2}]
-serverContainer.servletContextMismatch=Attempted to register a POJO annotated for WebSocket at path [{0}] in the ServletContext with context path [{1}] when the WebSocket ServerContainer is allocated to the ServletContext with context path [{2}]
 serverContainer.servletContextMissing=No ServletContext was specified
 serverContainer.threadGroupNotDestroyed=Unable to destroy WebSocket thread group [{0}] as [{1}] threads were still running when the web application was stopped. The thread group will be destroyed once the threads terminate.
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 07/15: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 19f92c144c1dcb62b5bf790213a8a981044059be
Author: 康智冬 <[hidden email]>
AuthorDate: Sat Aug 31 16:52:30 2019 +0800

    Fix typo
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index 53f3925..33ddb97 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -277,7 +277,7 @@ public class Request implements HttpServletRequest {
 
 
     /**
-     * Using writer flag.
+     * Using reader flag.
      */
     protected boolean usingReader = false;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 08/15: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 654cacb9095f86d1004d2cbeb48f55e3f19caa13
Author: KangZhiDong <[hidden email]>
AuthorDate: Sun Sep 1 03:34:01 2019 +0800

    fix typo
---
 java/javax/servlet/http/HttpServletRequest.java   | 2 +-
 java/org/apache/jasper/compiler/JspConfig.java    | 2 +-
 java/org/apache/tomcat/util/digester/package.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/javax/servlet/http/HttpServletRequest.java b/java/javax/servlet/http/HttpServletRequest.java
index 0c3f7f8..1fd6cb3 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -308,7 +308,7 @@ public interface HttpServletRequest extends ServletRequest {
      * <td>/xyz
      * </table>
      * <p>
-     * To reconstruct an URL with a scheme and host, use
+     * To reconstruct a URL with a scheme and host, use
      * {@link #getRequestURL}.
      *
      * @return a <code>String</code> containing the part of the URL from the
diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java
index df34f3c..8157138 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -457,7 +457,7 @@ public class JspConfig {
     }
 
     /**
-     * To find out if an uri matches an url pattern in jsp config.  If so,
+     * To find out if a uri matches a url pattern in jsp config.  If so,
      * then the uri is a JSP page.  This is used primarily for jspc.
      */
     public boolean isJspPage(String uri) throws JasperException {
diff --git a/java/org/apache/tomcat/util/digester/package.html b/java/org/apache/tomcat/util/digester/package.html
index 6ffdf94..6446504 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -1049,9 +1049,9 @@ The <code><em>public-identifier</em></code> is an additional free identifier whi
 </p>
 <p>
 In practice, the weakness with a <code><em>system-identifier</em></code> is that most parsers
-will attempt to interpret this URI as an URL, try to download the resource directly
+will attempt to interpret this URI as a URL, try to download the resource directly
 from the URL and stop the parsing if this download fails. So, this means that
-almost always the URI will have to be an URL from which the declaration
+almost always the URI will have to be a URL from which the declaration
 can be downloaded.
 </p>
 <p>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 09/15: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 71aa3a90f8cf3e0ac9ed318ac78919fcc309c0ac
Author: KangZhiDong <[hidden email]>
AuthorDate: Sun Sep 1 04:21:45 2019 +0800

    fix typo
---
 java/javax/servlet/resources/web-app_2_5.xsd                          | 2 +-
 java/javax/servlet/resources/web-common_3_0.xsd                       | 2 +-
 java/org/apache/catalina/filters/CorsFilter.java                      | 2 +-
 java/org/apache/catalina/filters/LocalStrings.properties              | 4 ++--
 java/org/apache/catalina/ssi/ResponseIncludeWrapper.java              | 2 +-
 java/org/apache/tomcat/util/http/FastHttpDateFormat.java              | 4 ++--
 java/org/apache/tomcat/util/http/parser/Host.java                     | 4 ++--
 java/org/apache/tomcat/websocket/server/UpgradeUtil.java              | 2 +-
 .../apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java    | 2 +-
 webapps/docs/config/cluster-valve.xml                                 | 2 +-
 webapps/docs/connectors.xml                                           | 2 +-
 webapps/docs/ssl-howto.xml                                            | 4 ++--
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/java/javax/servlet/resources/web-app_2_5.xsd b/java/javax/servlet/resources/web-app_2_5.xsd
index f01830f..72a0f6a 100644
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
     <xsd:simpleType name="http-methodType">
         <xsd:annotation>
             <xsd:documentation>
-                A HTTP method type as defined in HTTP 1.1 section 2.2.
+                An HTTP method type as defined in HTTP 1.1 section 2.2.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd b/java/javax/servlet/resources/web-common_3_0.xsd
index 8382e3e..6d5d875 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -593,7 +593,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
+        An HTTP method type as defined in HTTP 1.1 section 2.2.
 
       </xsd:documentation>
     </xsd:annotation>
diff --git a/java/org/apache/catalina/filters/CorsFilter.java b/java/org/apache/catalina/filters/CorsFilter.java
index 3ba0141..308c1b4 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1080,7 +1080,7 @@ public class CorsFilter implements Filter {
          */
         SIMPLE,
         /**
-         * A HTTP request that needs to be pre-flighted.
+         * An HTTP request that needs to be pre-flighted.
          */
         ACTUAL,
         /**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties b/java/org/apache/catalina/filters/LocalStrings.properties
index 3f2b136..649fde6 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -20,8 +20,8 @@ corsFilter.invalidSupportsCredentials=It is not allowed to configure supportsCre
 corsFilter.nullRequest=HttpServletRequest object is null
 corsFilter.nullRequestType=CORSRequestType object is null
 corsFilter.onlyHttp=CORS doesn't support non-HTTP request or response
-corsFilter.wrongType1=Expects a HttpServletRequest object of type [{0}]
-corsFilter.wrongType2=Expects a HttpServletRequest object of type [{0}] or [{1}]
+corsFilter.wrongType1=Expects an HttpServletRequest object of type [{0}]
+corsFilter.wrongType2=Expects an HttpServletRequest object of type [{0}] or [{1}]
 
 csrfPrevention.invalidRandomClass=Unable to create Random source using class [{0}]
 
diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
index 129df92..e06407d 100644
--- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
+++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
 import org.apache.tomcat.util.ExceptionUtils;
 
 /**
- * A HttpServletResponseWrapper, used from
+ * An HttpServletResponseWrapper, used from
  * <code>SSIServletExternalResolver</code>
  *
  * @author Bip Thelin
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 11e7f31..3398d51 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -145,7 +145,7 @@ public final class FastHttpDateFormat {
 
 
     /**
-     * Try to parse the given date as a HTTP date.
+     * Try to parse the given date as an HTTP date.
      * @param value The HTTP date
      * @param threadLocalformats Ignored. The local array of
      *                           ConcurrentDateFormat will always be used.
@@ -161,7 +161,7 @@ public final class FastHttpDateFormat {
 
 
     /**
-     * Try to parse the given date as a HTTP date.
+     * Try to parse the given date as an HTTP date.
      * @param value The HTTP date
      * @return the date as a long or <code>-1</code> if the value cannot be
      *         parsed
diff --git a/java/org/apache/tomcat/util/http/parser/Host.java b/java/org/apache/tomcat/util/http/parser/Host.java
index 1400de1..b774ef2 100644
--- a/java/org/apache/tomcat/util/http/parser/Host.java
+++ b/java/org/apache/tomcat/util/http/parser/Host.java
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.buf.MessageBytes;
 public class Host {
 
     /**
-     * Parse the given input as a HTTP Host header value.
+     * Parse the given input as an HTTP Host header value.
      *
      * @param mb The host header value
      *
@@ -42,7 +42,7 @@ public class Host {
 
 
     /**
-     * Parse the given input as a HTTP Host header value.
+     * Parse the given input as an HTTP Host header value.
      *
      * @param string The host header value
      *
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index 36dfbc5..04d713e 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -70,7 +70,7 @@ public class UpgradeUtil {
      * @param request  The request to check if it is an HTTP upgrade request for
      *                 a WebSocket connection
      * @param response The response associated with the request
-     * @return <code>true</code> if the request includes a HTTP Upgrade request
+     * @return <code>true</code> if the request includes an HTTP Upgrade request
      *         for the WebSocket protocol, otherwise <code>false</code>
      */
     public static boolean isWebSocketUpgradeRequest(ServletRequest request,
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
index a269b6e..e1d5535 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
@@ -25,7 +25,7 @@ public class TestWsWebSocketContainerWithProxy extends TestWsWebSocketContainer
 
     @BeforeClass
     public static void init() {
-        // Set the system properties for a HTTP proxy on 192.168.0.100:80
+        // Set the system properties for an HTTP proxy on 192.168.0.100:80
         // I used an httpd instance configured as an open forward proxy for this
         // Update the IP/hostname as required
         System.setProperty("http.proxyHost", "192.168.0.100");
diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml
index deee3d8..043bc6b 100644
--- a/webapps/docs/config/cluster-valve.xml
+++ b/webapps/docs/config/cluster-valve.xml
@@ -46,7 +46,7 @@
 </section>
 
 <section name="org.apache.catalina.ha.tcp.ReplicationValve">
-  The <code>ReplicationValve</code> will notify the cluster at the end of a HTTP request
+  The <code>ReplicationValve</code> will notify the cluster at the end of an HTTP request
   so that the cluster can make a decision whether there is data to be replicated or not.
   <subsection name="Attributes">
     <attributes>
diff --git a/webapps/docs/connectors.xml b/webapps/docs/connectors.xml
index be443d9..fe297a1 100644
--- a/webapps/docs/connectors.xml
+++ b/webapps/docs/connectors.xml
@@ -46,7 +46,7 @@ hopefully help you make the right choice according to your needs.</p>
 <p>The HTTP connector is setup by default with Tomcat, and is ready to use. This
 connector features the lowest latency and best overall performance.</p>
 
-<p>For clustering, a HTTP load balancer <b>with support for web sessions stickiness</b>
+<p>For clustering, an HTTP load balancer <b>with support for web sessions stickiness</b>
 must be installed to direct the traffic to the Tomcat servers. Tomcat supports mod_proxy
 (on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as the load balancer.
 It should be noted that the performance of HTTP proxying is usually lower than the
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 6e26045..3680718 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -259,7 +259,7 @@ in the <b>protocol</b> attribute of the <a href="config/http.html">Connector</a>
 
 <p>To define a Java (JSSE) connector, regardless of whether the APR library is
 loaded or not, use one of the following:</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO implementation -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO implementation -->
 <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
            port="8443" .../>
 
@@ -267,7 +267,7 @@ loaded or not, use one of the following:</p>
 <Connector protocol="org.apache.coyote.http11.Http11Protocol"
            port="8443" .../>]]></source>
 <p>Alternatively, to specify an APR connector (the APR library must be available) use:</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, APR implementation -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, APR implementation -->
 <Connector protocol="org.apache.coyote.http11.Http11AprProtocol"
            port="8443" .../>]]></source>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 10/15: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 035187b247199f15a0aec3a24585fc6701cafdb7
Author: 康智冬 <[hidden email]>
AuthorDate: Tue Sep 3 21:48:48 2019 +0800

    Fix typo
   
    fix typo
---
 java/org/apache/coyote/ajp/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java
index 31121e0..8279966 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -114,7 +114,7 @@ public final class Constants {
     // Ajp13 specific -  needs refactoring for the new model
 
     /**
-     * Default maximum total byte size for a AJP packet
+     * Default maximum total byte size for an AJP packet
      */
     public static final int MAX_PACKET_SIZE = 8192;
     /**


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 11/15: fix typo (an ssl)

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit fcca9621a8a36fba31a9dedad5602966c8e65e6e
Author: KangZhiDong <[hidden email]>
AuthorDate: Wed Sep 4 22:48:23 2019 +0800

    fix typo (an ssl)
---
 conf/server.xml                                        | 2 +-
 java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
 java/org/apache/tomcat/jni/SSL.java                    | 2 +-
 java/org/apache/tomcat/jni/SSLContext.java             | 6 +++---
 java/org/apache/tomcat/jni/SSLSocket.java              | 6 +++---
 java/org/apache/tomcat/util/net/NioChannel.java        | 2 +-
 java/org/apache/tomcat/util/net/SecureNioChannel.java  | 2 +-
 webapps/docs/config/ajp.xml                            | 2 +-
 webapps/docs/config/http.xml                           | 2 +-
 webapps/docs/ssl-howto.xml                             | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/conf/server.xml b/conf/server.xml
index df638a3..502858c 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -78,7 +78,7 @@
                connectionTimeout="20000"
                redirectPort="8443" />
     -->
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443
+    <!-- Define an SSL HTTP/1.1 Connector on port 8443
          This connector uses the BIO implementation that requires the JSSE
          style configuration. When using the APR/native implementation, the
          OpenSSL style configuration is required as described in the APR/native
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index 8925f2a..7e7e49b 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -76,7 +76,7 @@ jndiRealm.exception=Exception performing authentication
 jndiRealm.exception.retry=Exception performing authentication. Retrying...
 jndiRealm.invalidHostnameVerifier=[{0}] not a valid class name for a HostnameVerifier
 jndiRealm.invalidSslProtocol=Given protocol [{0}] is invalid. It has to be one of [{1}]
-jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for a SSLSocketFactory
+jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for an SSLSocketFactory
 jndiRealm.negotiatedTls=Negotiated tls connection using protocol [{0}]
 jndiRealm.open=Exception opening directory server connection
 jndiRealm.tlsClose=Exception closing tls response
diff --git a/java/org/apache/tomcat/jni/SSL.java b/java/org/apache/tomcat/jni/SSL.java
index 0baa0ef..366acd7 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -130,7 +130,7 @@ public final class SSL {
     /* Set on servers to choose the cipher according to the server's
      * preferences */
     public static final int SSL_OP_CIPHER_SERVER_PREFERENCE         = 0x00400000;
-    /* If set, a server will allow a client to issue a SSLv3.0 version number
+    /* If set, a server will allow a client to issue an SSLv3.0 version number
      * as latest version supported in the premaster secret, even when TLSv1.0
      * (version 3.1) was announced in the client hello. Normally this is
      * forbidden to prevent version rollback attacks. */
diff --git a/java/org/apache/tomcat/jni/SSLContext.java b/java/org/apache/tomcat/jni/SSLContext.java
index e8be0c6..9335159 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -107,7 +107,7 @@ public final class SSLContext {
      * <b>mode</b>. SSL objects created from <b>ctx</b> inherit the
      * <b>mode</b> valid at the time and may be 0 or 1.
      * <br>
-     * Normally when a SSL connection is finished, the parties must send out
+     * Normally when an SSL connection is finished, the parties must send out
      * "close notify" alert messages using L&lt;SSL_shutdown(3)|SSL_shutdown(3)&gt;
      * for a clean shutdown.
      * <br>
@@ -131,7 +131,7 @@ public final class SSLContext {
      * is permitted to negotiate in the SSL handshake phase. Notice that this
      * directive can be used both in per-server and per-directory context.
      * In per-server context it applies to the standard SSL handshake when a
-     * connection is established. In per-directory context it forces a SSL
+     * connection is established. In per-directory context it forces an SSL
      * renegotiation with the reconfigured Cipher Suite after the HTTP request
      * was read but before the HTTP response is sent.
      * @param ctx Server or Client context to use.
@@ -276,7 +276,7 @@ public final class SSLContext {
      * Authentication. Notice that this directive can be used both in per-server
      * and per-directory context. In per-server context it applies to the client
      * authentication process used in the standard SSL handshake when a connection
-     * is established. In per-directory context it forces a SSL renegotiation with
+     * is established. In per-directory context it forces an SSL renegotiation with
      * the reconfigured client verification level after the HTTP request was read
      * but before the HTTP response is sent.
      * <br>
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java b/java/org/apache/tomcat/jni/SSLSocket.java
index 7a9b237..e21d566 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -24,7 +24,7 @@ package org.apache.tomcat.jni;
 public class SSLSocket {
 
     /**
-     * Attach APR socket on a SSL connection.
+     * Attach APR socket on an SSL connection.
      * @param ctx SSLContext to use.
      * @param sock APR Socket that already did physical connect or accept.
      * @return APR_STATUS code.
@@ -34,14 +34,14 @@ public class SSLSocket {
         throws Exception;
 
     /**
-     * Do a SSL handshake.
+     * Do an SSL handshake.
      * @param thesocket The socket to use
      * @return the handshake status
      */
     public static native int handshake(long thesocket);
 
     /**
-     * Do a SSL renegotiation.
+     * Do an SSL renegotiation.
      * SSL supports per-directory re-configuration of SSL parameters.
      * This is implemented by performing an SSL renegotiation of the
      * re-configured parameters after the request is read, but before the
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java
index 64056ba..74d056c 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.res.StringManager;
 /**
  *
  * Base class for a SocketChannel wrapper used by the endpoint.
- * This way, logic for a SSL socket channel remains the same as for
+ * This way, logic for an SSL socket channel remains the same as for
  * a non SSL, making sure we don't need to code for any exception cases.
  *
  * @author Filip Hanik
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 24884d1e..84e51bb 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -381,7 +381,7 @@ public class SecureNioChannel extends NioChannel  {
     }
 
     /**
-     * Sends a SSL close message, will not physically close the connection here.
+     * Sends an SSL close message, will not physically close the connection here.
      * <br>To close the connection, you could do something like
      * <pre><code>
      *   close();
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 32a9474..8d6a01b 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -232,7 +232,7 @@
       calls to <code>request.isSecure()</code> to return <code>true</code>
       for requests received by this Connector. You would want this on an
       SSL Connector or a non SSL connector that is receiving data from a
-      SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
+      SSL accelerator, like a crypto card, an SSL appliance or even a webserver.
       The default value is <code>false</code>.</p>
     </attribute>
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index c947d40..880a255 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -220,7 +220,7 @@
       calls to <code>request.isSecure()</code> to return <code>true</code>
       for requests received by this Connector. You would want this on an
       SSL Connector or a non SSL connector that is receiving data from a
-      SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
+      SSL accelerator, like a crypto card, an SSL appliance or even a webserver.
       The default value is <code>false</code>.</p>
     </attribute>
 
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 3680718..f895928 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -301,7 +301,7 @@ file installed with Tomcat.  To configure an SSL connector that uses JSSE, you
 will need to remove the comments and edit it so it looks something like
 this:</p>
 <source>
-&lt;!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
+&lt;!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;Connector
            protocol="org.apache.coyote.http11.Http11NioProtocol"
            port="8443" maxThreads="200"
@@ -313,7 +313,7 @@ this:</p>
   The APR connector uses different attributes for many SSL settings,
   particularly keys and certificates. An example of an APR configuration is:
 <source>
-&lt;!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
+&lt;!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 --&gt;
 &lt;Connector
            protocol="org.apache.coyote.http11.Http11AprProtocol"
            port="8443" maxThreads="200"


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 12/15: fix typo(an sql)

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 1177ce95177af8326a706aaa308df0e043a96c98
Author: KangZhiDong <[hidden email]>
AuthorDate: Fri Sep 6 22:53:51 2019 +0800

    fix typo(an sql)
---
 java/org/apache/catalina/realm/JDBCRealm.java                       | 6 +++---
 modules/jdbc-pool/doc/jdbc-pool.xml                                 | 2 +-
 .../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java    | 4 ++--
 .../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java    | 2 +-
 .../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/realm/JDBCRealm.java b/java/org/apache/catalina/realm/JDBCRealm.java
index 45e2faa..9679de2 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -339,7 +339,7 @@ public class JDBCRealm
         // This needs rewritten with better pooling support, the existing code
         // needs signature changes since the Prepared statements needs cached
         // with the connections.
-        // The code below will try twice if there is a SQLException so the
+        // The code below will try twice if there is an SQLException so the
         // connection may try to be opened again. On normal conditions (including
         // invalid login - the above is only used once.
         int numberOfTries = 2;
@@ -546,7 +546,7 @@ public class JDBCRealm
         // This needs rewritten with better pooling support, the existing code
         // needs signature changes since the Prepared statements needs cached
         // with the connections.
-        // The code below will try twice if there is a SQLException so the
+        // The code below will try twice if there is an SQLException so the
         // connection may try to be opened again. On normal conditions (including
         // invalid login - the above is only used once.
         int numberOfTries = 2;
@@ -627,7 +627,7 @@ public class JDBCRealm
         // This needs rewritten wuth better pooling support, the existing code
         // needs signature changes since the Prepared statements needs cached
         // with the connections.
-        // The code below will try twice if there is a SQLException so the
+        // The code below will try twice if there is an SQLException so the
         // connection may try to be opened again. On normal conditions (including
         // invalid login - the above is only used once.
         int numberOfTries = 2;
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml
index b21c01f..360ba43 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -119,7 +119,7 @@
   <subsection name="Additional features">
     <p>The Tomcat connection pool offers a few additional features over what most other pools let you do:</p>
     <ul>
-      <li><code>initSQL</code> - the ability to run a SQL statement exactly once, when the connection is created</li>
+      <li><code>initSQL</code> - the ability to run an SQL statement exactly once, when the connection is created</li>
       <li><code>validationInterval</code> - in addition to running validations on connections, avoid running them too frequently.</li>
       <li><code>jdbcInterceptors</code> - flexible and pluggable interceptors to create any customizations around the pool,
           the query execution and the result set handling. More on this in the advanced section.</li>
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
index 2359fc8..4ce7708 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
@@ -501,7 +501,7 @@ public interface PoolConfiguration {
      * The SQL query that will be used to validate connections from this
      * pool before returning them to the caller or pool.
      * If specified, this query does not have to return any data,
-     * it just can't throw a SQLException.
+     * it just can't throw an SQLException.
      * The default value is null.
      * Example values are SELECT 1(mysql),
      * select 1 from dual(oracle),
@@ -514,7 +514,7 @@ public interface PoolConfiguration {
      * The SQL query that will be used to validate connections from this
      * pool before returning them to the caller or pool.
      * If specified, this query does not have to return any data,
-     * it just can't throw a SQLException.
+     * it just can't throw an SQLException.
      * The default value is null.
      * Example values are SELECT 1(mysql),
      * select 1 from dual(oracle),
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
index 951b803..4f93c0c 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.sql.SQLException;
 /**
  * Interceptor that traps any unhandled exception types and throws an exception that has been declared by the method
- * called, or throw a SQLException if it is declared.
+ * called, or throw an SQLException if it is declared.
  * If the caught exception is not declared, and the method doesn't throw SQLException, then this interceptor will
  * throw a RuntimeException
  * @author fhanik
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
index 38b009f..ee83e1e 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
@@ -117,7 +117,7 @@
              writeable="false"/>
 
     <attribute    name="maxWait"
-           description="The time to wait in milliseconds before a SQLException is thrown when a connection is requested"
+           description="The time to wait in milliseconds before an SQLException is thrown when a connection is requested"
                   type="java.lang.Integer"
              writeable="false"/>
 
@@ -214,7 +214,7 @@
              writeable="false"/>
 
     <attribute    name="initSQL"
-           description="A SQL executed once per connection, when it is established"
+           description="An SQL executed once per connection, when it is established"
                   type="java.lang.String"
              writeable="false"/>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 13/15: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f39f001bf6310ef448408845b5eff0ffdab3de13
Author: 康智冬 <[hidden email]>
AuthorDate: Wed Sep 11 09:05:04 2019 +0800

    Fix typo
   
    remove extra ‘a’
---
 java/org/apache/catalina/util/SessionIdGeneratorBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/util/SessionIdGeneratorBase.java b/java/org/apache/catalina/util/SessionIdGeneratorBase.java
index 2f4a4cb..bd93d32 100644
--- a/java/org/apache/catalina/util/SessionIdGeneratorBase.java
+++ b/java/org/apache/catalina/util/SessionIdGeneratorBase.java
@@ -44,7 +44,7 @@ public abstract class SessionIdGeneratorBase extends LifecycleBase
      * identifiers. If the queue is empty when a random number generator is
      * required, a new random number generator object is created. This is
      * designed this way since random number generators use a sync to make them
-     * thread-safe and the sync makes using a a single object slow(er).
+     * thread-safe and the sync makes using a single object slow(er).
      */
     private final Queue<SecureRandom> randoms = new ConcurrentLinkedQueue<SecureRandom>();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 14/15: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 09a1756c6d9098e10b7985fa1771eb37a941eac2
Author: 康智冬 <[hidden email]>
AuthorDate: Wed Sep 11 10:13:46 2019 +0800

    Fix typo
   
    add missing javadoc
---
 java/org/apache/catalina/ha/session/BackupManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java
index 565a824..b48aa7e 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -61,7 +61,7 @@ public class BackupManager extends ClusterManagerBase
     protected String name;
 
     /**
-     *
+     * Flag for how this map sends messages.
      */
     private int mapSendOptions = Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 15/15: Update changelog for PR from KangZhiDong

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 09e80f5cbf1149e12d94beb70565179129dd6775
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 11:50:44 2019 +0100

    Update changelog for PR from KangZhiDong
---
 webapps/docs/changelog.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 58301fa..1f94919 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,10 @@
         application to enable release builds to be built with Java 10 onwards.
         (markt)
       </fix>
+      <fix>
+        Fix a large number of Javadoc and documentation typos. Patch provided by
+        KangZhiDong. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
@@ -224,6 +228,10 @@
         Fix <code>JSSE_OPTS</code> quoting in <code>catalina.bat</code>.
         Contributed by Peter Uhnak. (fschumacher)
       </fix>
+      <fix>
+        Remove unused i18n messages and associated translations. Patch provided
+        by KangZhiDong. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]