You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by eb...@apache.org on 2022/09/28 12:03:54 UTC
[tomcat] branch 10.0.x updated (9eb2d683dd -> 354b994d2e)
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 9eb2d683dd Add release date for 10.0.26
new 43c66d94fa Fix the typos in the XML schemas
new 1ada6748a9 Fix the typos in the documentation
new c1170212fa Fix the typos in the source code
new ed812fb4b8 Fix the typos in the resource bundles
new 6548bac39c Fix the typos in the build files
new 354b994d2e Fix more typos
The 6 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:
build.xml | 4 ++--
java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +-
java/jakarta/servlet/jsp/resources/jspxml.xsd | 2 +-
java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd | 4 ++--
.../servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
java/jakarta/servlet/resources/javaee_web_services_1_2.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_1_3.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_1_4.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
java/jakarta/servlet/resources/jsp_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-app_4_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_5_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_4_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_5_0.xsd | 2 +-
java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
java/org/apache/catalina/Context.java | 2 +-
java/org/apache/catalina/ha/session/LocalStrings.properties | 4 ++--
java/org/apache/catalina/mapper/MapperListener.java | 4 ++--
java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
java/org/apache/catalina/tribes/ByteMessage.java | 2 +-
.../catalina/tribes/group/interceptors/TcpFailureDetector.java | 2 +-
.../catalina/tribes/group/interceptors/TcpPingInterceptor.java | 2 +-
.../tribes/group/interceptors/TwoPhaseCommitInterceptor.java | 2 +-
java/org/apache/catalina/tribes/membership/McastServiceImpl.java | 4 ++--
java/org/apache/catalina/users/DataSourceUserDatabase.java | 2 +-
.../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
java/org/apache/coyote/ActionHook.java | 2 +-
java/org/apache/coyote/RequestInfo.java | 2 +-
java/org/apache/coyote/Response.java | 2 +-
java/org/apache/coyote/http11/Http11Processor.java | 2 +-
java/org/apache/coyote/http2/AbstractNonZeroStream.java | 6 +++---
java/org/apache/jasper/compiler/Parser.java | 2 +-
java/org/apache/jasper/compiler/ServletWriter.java | 8 ++++----
java/org/apache/jasper/runtime/PageContextImpl.java | 2 +-
java/org/apache/jasper/tagplugins/jstl/core/ForEach.java | 2 +-
java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java | 2 +-
java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/digester/package.html | 2 +-
java/org/apache/tomcat/util/json/ParseException.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java | 4 ++--
java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
java/org/apache/tomcat/util/threads/TaskQueue.java | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 4 ++--
modules/jdbc-pool/doc/package.xsl | 4 ++--
.../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
.../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java | 2 +-
.../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
res/maven/mvn-pub.xml | 4 ++--
res/maven/tomcat-embed-programmatic.pom | 2 +-
res/scripts/check-mime.pl | 2 +-
.../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java | 2 +-
test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 8 ++++----
test/org/apache/catalina/tribes/demos/MapDemo.java | 2 +-
test/org/apache/coyote/http11/TestHttp11Processor.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java | 2 +-
test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
test/org/apache/tomcat/websocket/TestWsSubprotocols.java | 2 +-
webapps/docs/changelog.xml | 6 +++---
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/filter.xml | 2 +-
webapps/docs/config/globalresources.xml | 2 +-
webapps/docs/config/http.xml | 6 +++---
webapps/docs/config/jaspic.xml | 2 +-
webapps/docs/config/realm.xml | 2 +-
webapps/docs/config/sessionidgenerator.xml | 2 +-
webapps/docs/config/systemprops.xml | 4 ++--
webapps/docs/config/valve.xml | 4 ++--
webapps/docs/jasper-howto.xml | 2 +-
webapps/docs/monitoring.xml | 4 ++--
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/rewrite.xml | 2 +-
webapps/docs/ssi-howto.xml | 2 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 2 +-
webapps/examples/websocket/drawboard.xhtml | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
87 files changed, 114 insertions(+), 114 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/06: Fix the typos in the resource bundles
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ed812fb4b80266d7908fc292155dd87e6f96f054
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:47:50 2022 +0200
Fix the typos in the resource bundles
---
java/org/apache/catalina/ha/session/LocalStrings.properties | 4 ++--
java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 5ba274aeea..d894dd3c64 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -75,12 +75,12 @@ deltaSession.writeSession=writeObject() storing session [{0}]
jvmRoute.cannotFindSession=Cannot find session [{0}]
jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: [{0}] new one: [{1}] at session id [{2}]
+jvmRoute.failover=Detected a failover with different jvmRoute - original route: [{0}] new one: [{1}] at session id [{2}]
jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]
jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is not being used. Fail over will still work, providing a PersistentManager is used.
jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
-jvmRoute.set.originalsessionid=Set Orginal Session id at request attribute [{0}] value: [{1}]
+jvmRoute.set.originalsessionid=Set Original Session id at request attribute [{0}] value: [{1}]
jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
jvmRoute.valve.started=JvmRouteBinderValve started
jvmRoute.valve.stopped=JvmRouteBinderValve stopped
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 2dd62b93e9..cd883e6f57 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -30,4 +30,4 @@ hexUtils.fromHex.oddDigits=The input must consist of an even number of hex digit
uDecoder.eof=End of file (EOF)
uDecoder.noSlash=The encoded slash character is not allowed
uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set [{1}]
-uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character must be followed by two hexademical digits
+uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character must be followed by two hexadecimal digits
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/06: Fix the typos in the build files
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6548bac39c9245c964070389acd7eca79c2bd764
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:51:12 2022 +0200
Fix the typos in the build files
---
build.xml | 4 ++--
res/maven/mvn-pub.xml | 4 ++--
res/maven/tomcat-embed-programmatic.pom | 2 +-
res/scripts/check-mime.pl | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index 774e25ea37..6485bc5c1d 100644
--- a/build.xml
+++ b/build.xml
@@ -2637,7 +2637,7 @@ version.dev=
# Ensure consistent timestamps for reproducible builds.
ant.tstamp.now.iso=${tstamp.iso.release}
-# Enable insertion of detatched signatures into the Windows installer.
+# Enable insertion of detached signatures into the Windows installer.
do.codesigning=true
# Re-use the same GPG executable.
@@ -2655,7 +2655,7 @@ gpg.exec=${gpg.exec}
# Java Version: ${java.vm.version}
# The following is provided for information only. Builds will be repeatable
-# whether or not the build ennvironment in consistent with this information.
+# whether or not the build environment in consistent with this information.
#
# OS: ${os.arch} ${os.name} ${os.version}
# File encoding: ${file.encoding}
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index ef9e0903ad..af14fa5fe9 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -344,7 +344,7 @@
<doMavenInstall artifactId="tomcat-dbcp"/>
<doMavenInstall artifactId="tomcat-websocket"/>
- <!-- Emedded jars -->
+ <!-- Embedded jars -->
<doMavenInstall artifactId="tomcat-embed-core"
groupId="org.apache.tomcat.embed"
file="${tomcat.embed.path}/tomcat-embed-core.jar"
@@ -456,7 +456,7 @@
<doMavenDeployNoSrc artifactId="tomcat-i18n-ru"/>
<doMavenDeployNoSrc artifactId="tomcat-i18n-zh-CN"/>
- <!-- Emedded jars -->
+ <!-- Embedded jars -->
<!-- Skip DBCP - optional and can use standard ones above -->
<doMavenDeploy artifactId="tomcat-embed-core"
groupId="org.apache.tomcat.embed"
diff --git a/res/maven/tomcat-embed-programmatic.pom b/res/maven/tomcat-embed-programmatic.pom
index 84fe088027..58add74081 100644
--- a/res/maven/tomcat-embed-programmatic.pom
+++ b/res/maven/tomcat-embed-programmatic.pom
@@ -23,7 +23,7 @@
<groupId>org.apache.tomcat.experimental</groupId>
<artifactId>tomcat-embed-programmatic</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
- <description>Exerimental Minimal Tomcat for Programmatic Use</description>
+ <description>Experimental Minimal Tomcat for Programmatic Use</description>
<url>https://tomcat.apache.org/</url>
<licenses>
<license>
diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl
index a589022e18..e3359bd8d5 100755
--- a/res/scripts/check-mime.pl
+++ b/res/scripts/check-mime.pl
@@ -37,7 +37,7 @@
# new web.xml.
# B) Mime type differences for the same extension between httpd
# and Tomcat that are not part of TOMCAT_KEEP are logged.
-# They will be overwritten wit the httpd definition in the generated
+# They will be overwritten with the httpd definition in the generated
# new web.xml. If you want to keep their Tomcat definition, add them
# to TOMCAT_KEEP and run the script again. If you want to use the
# definitions from httpd, commit the generated new web.xml.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/06: Fix more typos
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 354b994d2ea88baf134c2b7b34c0db441c7dbf63
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:51:34 2022 +0200
Fix more typos
---
java/org/apache/tomcat/util/digester/package.html | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 4 ++--
modules/jdbc-pool/doc/package.xsl | 4 ++--
webapps/examples/websocket/drawboard.xhtml | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/digester/package.html b/java/org/apache/tomcat/util/digester/package.html
index 3d20be416f..ee4d8381d1 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -777,7 +777,7 @@ matching namespace prefix patterns might be a better strategy.</p>
<p>When you set the <code>NamespaceAware</code> property to false, digester uses
the qualified element name (which includes the namespace prefix) rather than the
-local name as the patten component for the element. This means that your pattern
+local name as the pattern component for the element. This means that your pattern
matches can include namespace prefixes as well as element names. So, rather than
create namespace-aware rules, create pattern matches including the namespace
prefixes.</p>
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml
index b1ed9935d9..f0b5e00639 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -455,7 +455,7 @@
</attribute>
<attribute name="abandonWhenPercentageFull" required="false">
- <p>(int) Connections that have been abandoned (timed out) wont get closed and reported up unless
+ <p>(int) Connections that have been abandoned (timed out) won't get closed and reported up unless
the number of connections in use are above the percentage defined by <code>abandonWhenPercentageFull</code>.
The value should be between 0-100.
The default value is <code>0</code>, which implies that connections are eligible for closure as soon
@@ -724,7 +724,7 @@
<subsection name="org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReportJmx">
<p>Extends the <code>SlowQueryReport</code> and in addition to log entries it issues JMX notification
for monitoring tools to react to. Inherits all the attributes from its parent class.
- This class uses Tomcat's JMX engine so it wont work outside of the Tomcat container.
+ This class uses Tomcat's JMX engine so it won't work outside of the Tomcat container.
By default, JMX notifications are sent through the ConnectionPool mbean if it is enabled.
The <code>SlowQueryReportJmx</code> can also register an MBean if <code>notifyPool=false</code>
</p>
diff --git a/modules/jdbc-pool/doc/package.xsl b/modules/jdbc-pool/doc/package.xsl
index d3fd7eab8c..a987c80bd2 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -30,14 +30,14 @@
encoding="UTF-8"
indent="no"/>
- <!-- Defined parameters (overrideable) -->
+ <!-- Defined parameters (overridable) -->
<xsl:param name="relative-path" select="'.'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
<xsl:param name="standalone" select="''"/>
<xsl:param name="buglink" select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="revlink" select="'https://svn.apache.org/viewvc?view=rev&rev='"/>
- <!-- Defined variables (non-overrideable) -->
+ <!-- Defined variables (non-overridable) -->
<xsl:variable name="body-bg" select="'#ffffff'"/>
<xsl:variable name="body-fg" select="'#000000'"/>
<xsl:variable name="body-link" select="'#525D76'"/>
diff --git a/webapps/examples/websocket/drawboard.xhtml b/webapps/examples/websocket/drawboard.xhtml
index 14c5b2a7bd..a2edf3c71b 100644
--- a/webapps/examples/websocket/drawboard.xhtml
+++ b/webapps/examples/websocket/drawboard.xhtml
@@ -538,7 +538,7 @@
}
function refreshDisplayCanvas() {
- if (!isActive) { // Don't draw a curser when not active.
+ if (!isActive) { // Don't draw a cursor when not active.
return;
}
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index f051bcf8bd..7fa43dacb8 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -59,7 +59,7 @@
<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
<form action="<%= submitUrl %>" method="post" id="sessionsForm">
- <fieldset><legend>Active HttpSessions informations</legend>
+ <fieldset><legend>Active HttpSessions information</legend>
<input type="hidden" name="action" id="sessionsFormAction" value="injectSessions"/>
<input type="hidden" name="sort" id="sessionsFormSort" value="<%= JspHelper.escapeXml(request.getAttribute("sort")) %>"/>
<% String order = (String) request.getAttribute("order");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/06: Fix the typos in the documentation
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1ada6748a9442db3bffaecbc5c8f8e653878308d
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:40:05 2022 +0200
Fix the typos in the documentation
---
webapps/docs/changelog.xml | 6 +++---
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/filter.xml | 2 +-
webapps/docs/config/globalresources.xml | 2 +-
webapps/docs/config/http.xml | 6 +++---
webapps/docs/config/jaspic.xml | 2 +-
webapps/docs/config/realm.xml | 2 +-
webapps/docs/config/sessionidgenerator.xml | 2 +-
webapps/docs/config/systemprops.xml | 4 ++--
webapps/docs/config/valve.xml | 4 ++--
webapps/docs/jasper-howto.xml | 2 +-
webapps/docs/monitoring.xml | 4 ++--
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/rewrite.xml | 2 +-
webapps/docs/ssi-howto.xml | 2 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 2 +-
19 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d563dcb0c4..6db5c14808 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -739,7 +739,7 @@
<add>
Effectively disable the
<code>WebappClassLoaderBase.getResources()</code> method as it is not
- used and if something accidently exposes the class loader this method
+ used and if something accidentally exposes the class loader this method
can be used to gain access to Tomcat internals. (markt)
</add>
</changelog>
@@ -1331,7 +1331,7 @@
getting the passord of a user. (remm)
</fix>
<docs>
- Add Javadoc comment which listeners must be nested whithin
+ Add Javadoc comment which listeners must be nested within
<code>Server</code> elements only. (michaelo)
</docs>
<add>
@@ -4333,7 +4333,7 @@
<subsection name="General">
<changelog>
<scode>
- This release contains all of the changes upto and including those in
+ This release contains all of the changes up to and including those in
Apache Tomcat 9.0.31 plus the additional changes listed below. (markt)
</scode>
</changelog>
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 0fe0864d2f..34721f7b8d 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -96,7 +96,7 @@
7231 section 4.3.8, cookie and authorization headers will be excluded from
the response to the TRACE request. If you wish to include these, you can
implement the <code>doTrace()</code> method for the target Servlet and
- gain full control over the reponse.</p>
+ gain full control over the response.</p>
</attribute>
<attribute name="asyncTimeout" required="false">
diff --git a/webapps/docs/config/cluster-interceptor.xml b/webapps/docs/config/cluster-interceptor.xml
index 2dfc362024..d1b845dbc8 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -36,7 +36,7 @@
<section name="Introduction">
<p>
Apache Tribes supports an interceptor architecture to intercept both messages and membership notifications.
- This architecture allows decoupling of logic and opens the way for some very useful feature add ons.
+ This architecture allows decoupling of logic and opens the way for some very useful feature add-ons.
</p>
</section>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 80309e8010..6ac0b4a09b 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1156,7 +1156,7 @@
<attribute name="value" required="true">
<p>The parameter value that will be presented to the application
- when requested from the JNDI context. This value must be convertable
+ when requested from the JNDI context. This value must be convertible
to the Java type defined by the <code>type</code> attribute.</p>
</attribute>
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index da25ecb550..90880bced0 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1120,7 +1120,7 @@ FINE: Request "/docs/config/manager.html" with response status "200"
IPv6 are both fully supported.
</p>
- <p>This filter mimicks Apache httpd's <code>Order</code>,
+ <p>This filter mimics Apache httpd's <code>Order</code>,
<code>Allow from</code> and <code>Deny from</code> directives,
with the following limitations:
</p>
diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml
index 35b533e77a..fba311ff82 100644
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -118,7 +118,7 @@
<attribute name="value" required="true">
<p>The parameter value that will be presented to the application
- when requested from the JNDI context. This value must be convertable
+ when requested from the JNDI context. This value must be convertible
to the Java type defined by the <code>type</code> attribute.</p>
</attribute>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 6427c85bac..af2911f42c 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -62,7 +62,7 @@
received, Tomcat will accept new connections until the current number of
connections reaches <code>maxConnections</code>. Connections are queued inside
the server socket created by the <strong>Connector</strong> until a thread
- becomes avaialble to process the connection. Once <code>maxConnections</code>
+ becomes available to process the connection. Once <code>maxConnections</code>
has been reached the operating system will queue further connections. The size
of the operating system provided connection queue may be controlled by the
<code>acceptCount</code> attribute. If the operating system queue fills,
@@ -92,7 +92,7 @@
7231 section 4.3.8, cookie and authorization headers will be excluded from
the response to the TRACE request. If you wish to include these, you can
implement the <code>doTrace()</code> method for the target Servlet and
- gain full control over the reponse.</p>
+ gain full control over the response.</p>
</attribute>
<attribute name="asyncTimeout" required="false">
@@ -178,7 +178,7 @@
expires. For HTTP/1.1 upgrade, the request body is buffered for the
duration of the upgrade process. The limit can be disabled by setting this
attribute to -1. Setting the attribute to zero will disable the saving of
- the requets body data during authentication and HTTP/1.1 upgrade. If not
+ the request body data during authentication and HTTP/1.1 upgrade. If not
specified, this attribute is set to 4096 (4 kilobytes).</p>
</attribute>
diff --git a/webapps/docs/config/jaspic.xml b/webapps/docs/config/jaspic.xml
index 15a611ff41..56d0e8d96f 100644
--- a/webapps/docs/config/jaspic.xml
+++ b/webapps/docs/config/jaspic.xml
@@ -54,7 +54,7 @@
<p>Users should be aware that if the static JASPIC configuration file
configures JASPIC for a given web application then the JASPIC configuration
- will take precendence over any <code><login-config></code> present in
+ will take precedence over any <code><login-config></code> present in
the web application's <code>WEB-INF/web.xml</code> file.</p>
</section>
diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml
index 78b4c20fd5..529a70c2f9 100644
--- a/webapps/docs/config/realm.xml
+++ b/webapps/docs/config/realm.xml
@@ -668,7 +668,7 @@
<attribute name="useStaticPrincipal" required="false">
<p>This allows using a static <code>Principal</code> instance
- disconnected from the database if needed. This makes the bahavior of
+ disconnected from the database if needed. This makes the behavior of
authenticated prinicipals equivalent to that of the other realms.
If there is a plan to use serialization, it is best to set this to
<code>true</code> as the principal will always be replaced by this
diff --git a/webapps/docs/config/sessionidgenerator.xml b/webapps/docs/config/sessionidgenerator.xml
index 2a1117c19d..d370f29810 100644
--- a/webapps/docs/config/sessionidgenerator.xml
+++ b/webapps/docs/config/sessionidgenerator.xml
@@ -65,7 +65,7 @@
<attribute name="jvmRoute" required="false">
<p>A routing identifier for this Tomcat instance. It will be added
- to the session id to allow for stateless stickyness routing by
+ to the session id to allow for stateless stickiness routing by
load balancers. The details on how the <code>jvmRoute</code>
will be included in the id are implementation dependent.
See <a href="#Standard_Implementation">Standard Implementation</a>
diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml
index 809c6fadd0..9246cf8f13 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -249,7 +249,7 @@
<properties>
<property name="tomcat.util.scan. StandardJarScanFilter.jarsToSkip">
- <p>A list of comma-separated file name patters that is used as the default
+ <p>A list of comma-separated file name patterns that is used as the default
value for <code>pluggabilitySkip</code> and <code>tldSkip</code>
attributes of the standard
<a href="jar-scan-filter.html">JarScanFilter</a> implementation.</p>
@@ -259,7 +259,7 @@
</property>
<property name="tomcat.util.scan. StandardJarScanFilter.jarsToScan">
- <p>A list of comma-separated file name patters that is used as the default
+ <p>A list of comma-separated file name patterns that is used as the default
value for <code>pluggabilityScan</code> and <code>tldScan</code>
attributes of the standard
<a href="jar-scan-filter.html">JarScanFilter</a> implementation.</p>
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 75c2a36288..4459000821 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -780,7 +780,7 @@
it will be passed on.
</p>
- <p>This valve mimicks Apache's <code>Order</code>,
+ <p>This valve mimics Apache's <code>Order</code>,
<code>Allow from</code> and <code>Deny from</code> directives,
with the following limitations:
</p>
@@ -2143,7 +2143,7 @@
<code>fullyQualifiedClassName</code> or a sub-class of it. For example,
<code>errorCode.java.io.IOException</code> specifies the file to return
for an <code>IOException</code>. The location may be relative or
- absolule. If relative, it must be relative to
+ absolute. If relative, it must be relative to
<code>$CATALINA_BASE</code>. If no matching error page is found, the
default <strong>Error Report Valve</strong> response will be
returned.</p>
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index cbf2388f93..3c48672e41 100644
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -504,7 +504,7 @@ with Jasper.
The second extension point is the Expression Language interpreter. Alternative
interpreters may be configured through the <code>ServletContext</code>. See the
<code>ELInterpreterFactory</code> javadoc for details of how to configure an
-alternative EL interpreter. A alternative interpreter primarily targetting tag
+alternative EL interpreter. A alternative interpreter primarily targeting tag
settings is provided at
<code>org.apache.jasper.optimizations.ELInterpreterTagSetters</code>. See the
javadoc for details of the optimisations and the impact they have on
diff --git a/webapps/docs/monitoring.xml b/webapps/docs/monitoring.xml
index b8698b2de3..216c28d597 100644
--- a/webapps/docs/monitoring.xml
+++ b/webapps/docs/monitoring.xml
@@ -153,12 +153,12 @@ senderAddress=${cluster.server.address},senderPort=${cluster.server.port}"
/>
<!-- get current maxActiveSession from ClusterTest application
echo it to Ant output and store at
- property <em>clustertest.maxActiveSessions.orginal</em>
+ property <em>clustertest.maxActiveSessions.original</em>
-->
<jmx:get
name="Catalina:type=Manager,context=/ClusterTest,host=localhost"
attribute="maxActiveSessions"
- resultproperty="clustertest.maxActiveSessions.orginal"
+ resultproperty="clustertest.maxActiveSessions.original"
echo="true"
/>
<!-- set maxActiveSession to 100
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index cbc60efda6..50134592ce 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -848,7 +848,7 @@ to all virtual hosts and web applications. The default contents of the
with all its roles. The cached user is <strong>not</strong> saved and
restored across sessions serialisations. When the user's principal object
is serialized for any reason, it will also be replaced by a static
- equivalent object with roles that will no longer reflect the databse
+ equivalent object with roles that will no longer reflect the database
contents.</li>
</ul>
diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index 4948026592..59c2d08624 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -44,7 +44,7 @@
<p>The rewrite valve can be configured as a valve added in a Host.
See <a href="config/host.html">virtual-server</a> documentation for
- informations how to configure it. It will use a <code>rewrite.config</code> file
+ information on how to configure it. It will use a <code>rewrite.config</code> file
containing the rewrite directives, it must be placed in the Host configuration
folder.
</p>
diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index 01793553a0..234ae2cf5e 100644
--- a/webapps/docs/ssi-howto.xml
+++ b/webapps/docs/ssi-howto.xml
@@ -142,7 +142,7 @@ false.</li>
whose type will be processed by the SSI servlet. The directives take the form of an HTML
comment. The directive is replaced by the results of interpreting it before sending the
page to the client. The general form of a directive is: </p>
-<p> <code><!--#directive [parm=value] --></code></p>
+<p> <code><!--#directive [param=value] --></code></p>
<p>The directives are:</p>
<ul>
<li>
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index f297fcd738..ebe70f1fa6 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -456,7 +456,7 @@ After that you can proceed with importing your Certificate.</p>
<p>Each Certificate Authority tends to differ slightly from the others. They may
require slightly different information and/or provide the certificate and
associated certificate chain in different formats. Additionally, the rules that
-the Certificate Authorities use for issuing certifcates change over time. As a
+the Certificate Authorities use for issuing certificates change over time. As a
result you may find that the commands given above may need to be modified. If
you require assitance then help is available via the
<a href="http://tomcat.apache.org/lists.html#tomcat-users">Apache Tomcat users
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 4b496aebe9..401afcd787 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -27,7 +27,7 @@
indent="no"
doctype-system="about:legacy-compat"/>
- <!-- Defined parameters (overrideable) -->
+ <!-- Defined parameters (overridable) -->
<xsl:param name="home-name" select="'The Tomcat Project'"/>
<xsl:param name="home-href" select="'https://tomcat.apache.org/'"/>
<xsl:param name="home-logo" select="'/images/tomcat.png'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/06: Fix the typos in the XML schemas
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 43c66d94fa71cec746d6a4018194ee40fc6f2248
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:20:59 2022 +0200
Fix the typos in the XML schemas
enpoint -> endpoint
expressable -> expressible
interaces -> interfaces
mulitple -> multiple
occurence -> occurrence
prefered -> preferred
refered -> referred
varaible -> variable
---
java/jakarta/servlet/jsp/resources/jspxml.xsd | 2 +-
java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd | 4 ++--
java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
java/jakarta/servlet/resources/javaee_web_services_1_2.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_1_3.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_1_4.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
java/jakarta/servlet/resources/jsp_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-app_4_0.xsd | 2 +-
java/jakarta/servlet/resources/web-app_5_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_3_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_3_1.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_4_0.xsd | 2 +-
java/jakarta/servlet/resources/web-fragment_5_0.xsd | 2 +-
java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
19 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index 0e5eba0b36..1634d208d9 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
jsp:useBean action or a custom action with an associated
VariableInfo entry for this name.
- Exact valid combinations are not expressable in XML Schema.
+ Exact valid combinations are not expressible in XML Schema.
They are:
name="Identifier" property="*"
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index 9f5716b32f..c9963a7540 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
<remote>com.wombat.empl.EmployeeService</remote>
This may not be specified in case there is no Service
- Enpoint Interface as is the case with directly using an
+ Endpoint Interface as is the case with directly using an
implementation class with the @WebService annotation.
When the port component is a Provider implementation
@@ -464,7 +464,7 @@
<xsd:documentation>
The jaxrpc-mapping-file element contains the name of a file that
- describes the Jakarta XML RPC mapping between the Java interaces used by
+ describes the Jakarta XML RPC mapping between the Java interfaces used by
the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module.
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
index dd01c6f5a3..5547d5e50a 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@
<xsd:documentation>
The jaxrpc-mapping-file element contains the name of a file that
- describes the Jakarta XML RPC mapping between the Java interaces used by
+ describes the Jakarta XML RPC mapping between the Java interfaces used by
the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module file.
@@ -140,7 +140,7 @@
<xsd:documentation>
The service-qname element declares the specific WSDL service
- element that is being refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
index 43914742ff..ec5540dd6c 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
+++ b/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd
@@ -336,7 +336,7 @@
<remote>com.wombat.empl.EmployeeService</remote>
This may not be specified in case there is no Service
- Enpoint Interface as is the case with directly using an
+ Endpoint Interface as is the case with directly using an
implementation class with the @WebService annotation.
When the port component is a Provider implementation
diff --git a/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
index d69d723e1d..71d4b33f73 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/jakarta/servlet/resources/javaee_web_services_1_3.xsd
@@ -332,7 +332,7 @@
<remote>com.wombat.empl.EmployeeService</remote>
This may not be specified in case there is no Service
- Enpoint Interface as is the case with directly using an
+ Endpoint Interface as is the case with directly using an
implementation class with the @WebService annotation.
When the port component is a Provider implementation
diff --git a/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd b/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
index e32c5b7d0c..032e6b7492 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/jakarta/servlet/resources/javaee_web_services_1_4.xsd
@@ -332,7 +332,7 @@
<remote>com.wombat.empl.EmployeeService</remote>
This may not be specified in case there is no Service
- Enpoint Interface as is the case with directly using an
+ Endpoint Interface as is the case with directly using an
implementation class with the @WebService annotation.
When the port component is a Provider implementation
diff --git a/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd
index e95308a0a8..e32af449b3 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd
+++ b/java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd
@@ -260,7 +260,7 @@
<xsd:documentation>
The service-qname element declares the specific WSDL service
- element that is being refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd
index b0d0985a94..4508a1071b 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd
+++ b/java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd
@@ -170,7 +170,7 @@
<xsd:documentation>
The service-qname element declares the specific WSDL service
- element that is being refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd b/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd
index fbd00cee7f..4c0415c17d 100644
--- a/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd
+++ b/java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd
@@ -170,7 +170,7 @@
<xsd:documentation>
The service-qname element declares the specific WSDL service
- element that is being refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
diff --git a/java/jakarta/servlet/resources/jsp_3_0.xsd b/java/jakarta/servlet/resources/jsp_3_0.xsd
index 4bb863911d..3b627b8001 100644
--- a/java/jakarta/servlet/resources/jsp_3_0.xsd
+++ b/java/jakarta/servlet/resources/jsp_3_0.xsd
@@ -168,7 +168,7 @@
or text declaration of a document in XML syntax and
in a JSP configuration element matching the document.
It is legal to name the same encoding through
- mulitple mechanisms.
+ multiple mechanisms.
</xsd:documentation>
</xsd:annotation>
diff --git a/java/jakarta/servlet/resources/web-app_3_0.xsd b/java/jakarta/servlet/resources/web-app_3_0.xsd
index 01526f02f5..6105db1c81 100644
--- a/java/jakarta/servlet/resources/web-app_3_0.xsd
+++ b/java/jakarta/servlet/resources/web-app_3_0.xsd
@@ -126,7 +126,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-app_3_1.xsd b/java/jakarta/servlet/resources/web-app_3_1.xsd
index 84ad8b9b21..75481dd005 100644
--- a/java/jakarta/servlet/resources/web-app_3_1.xsd
+++ b/java/jakarta/servlet/resources/web-app_3_1.xsd
@@ -126,7 +126,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-app_4_0.xsd b/java/jakarta/servlet/resources/web-app_4_0.xsd
index b5cfa9eeea..3a72f2d540 100644
--- a/java/jakarta/servlet/resources/web-app_4_0.xsd
+++ b/java/jakarta/servlet/resources/web-app_4_0.xsd
@@ -126,7 +126,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-app_5_0.xsd b/java/jakarta/servlet/resources/web-app_5_0.xsd
index de09e13438..ed3d98a8d5 100644
--- a/java/jakarta/servlet/resources/web-app_5_0.xsd
+++ b/java/jakarta/servlet/resources/web-app_5_0.xsd
@@ -95,7 +95,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-fragment_3_0.xsd b/java/jakarta/servlet/resources/web-fragment_3_0.xsd
index bd4e961611..3a1f9a41a2 100644
--- a/java/jakarta/servlet/resources/web-fragment_3_0.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_3_0.xsd
@@ -126,7 +126,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-fragment_3_1.xsd b/java/jakarta/servlet/resources/web-fragment_3_1.xsd
index 0373a66ed1..bd06b0ae2d 100644
--- a/java/jakarta/servlet/resources/web-fragment_3_1.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_3_1.xsd
@@ -126,7 +126,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-fragment_4_0.xsd b/java/jakarta/servlet/resources/web-fragment_4_0.xsd
index ed2d7600c8..e93c92a0eb 100644
--- a/java/jakarta/servlet/resources/web-fragment_4_0.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_4_0.xsd
@@ -126,7 +126,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-fragment_5_0.xsd b/java/jakarta/servlet/resources/web-fragment_5_0.xsd
index a5c8450f71..bea06eb976 100644
--- a/java/jakarta/servlet/resources/web-fragment_5_0.xsd
+++ b/java/jakarta/servlet/resources/web-fragment_5_0.xsd
@@ -95,7 +95,7 @@
file must not contain multiple elements of session-config,
jsp-config, and login-config. When there are multiple elements of
welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
+ must concatenate the element contents. The multiple occurrence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
one distributable.
diff --git a/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
index 30c34443c3..cd1f664d6a 100644
--- a/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
+++ b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd
@@ -575,7 +575,7 @@
short-name a simple default short name that could be
used by a JSP authoring tool to create
names with a mnemonic value; for example,
- the it may be used as the prefered prefix
+ the it may be used as the preferred prefix
value in taglib directives
uri a uri uniquely identifying this taglib
@@ -722,7 +722,7 @@
declare Whether the variable is declared
or not. True is the default.
- scope The scope of the scripting varaible
+ scope The scope of the scripting variable
defined. NESTED is default.
</xsd:documentation>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/06: Fix the typos in the source code
Posted by eb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c1170212fa38018b0953527810e833d5dbe67a82
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Sep 28 13:46:55 2022 +0200
Fix the typos in the source code
---
java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +-
java/org/apache/catalina/Context.java | 2 +-
java/org/apache/catalina/mapper/MapperListener.java | 4 ++--
java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
java/org/apache/catalina/tribes/ByteMessage.java | 2 +-
.../catalina/tribes/group/interceptors/TcpFailureDetector.java | 2 +-
.../catalina/tribes/group/interceptors/TcpPingInterceptor.java | 2 +-
.../tribes/group/interceptors/TwoPhaseCommitInterceptor.java | 2 +-
java/org/apache/catalina/tribes/membership/McastServiceImpl.java | 4 ++--
java/org/apache/catalina/users/DataSourceUserDatabase.java | 2 +-
.../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
java/org/apache/coyote/ActionHook.java | 2 +-
java/org/apache/coyote/RequestInfo.java | 2 +-
java/org/apache/coyote/Response.java | 2 +-
java/org/apache/coyote/http11/Http11Processor.java | 2 +-
java/org/apache/coyote/http2/AbstractNonZeroStream.java | 6 +++---
java/org/apache/jasper/compiler/Parser.java | 2 +-
java/org/apache/jasper/compiler/ServletWriter.java | 8 ++++----
java/org/apache/jasper/runtime/PageContextImpl.java | 2 +-
java/org/apache/jasper/tagplugins/jstl/core/ForEach.java | 2 +-
java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java | 2 +-
java/org/apache/tomcat/util/json/ParseException.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java | 4 ++--
java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
java/org/apache/tomcat/util/threads/TaskQueue.java | 2 +-
.../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
.../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java | 2 +-
.../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
.../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java | 2 +-
test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 8 ++++----
test/org/apache/catalina/tribes/demos/MapDemo.java | 2 +-
test/org/apache/coyote/http11/TestHttp11Processor.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java | 2 +-
test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
test/org/apache/tomcat/websocket/TestWsSubprotocols.java | 2 +-
38 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
index a1c53568f9..93d4cfe112 100644
--- a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -85,7 +85,7 @@ public interface JspPropertyGroupDescriptor {
public String getDeferredSyntaxAllowedAsLiteral();
/**
- * Should the JSPs in this group have template text that onyl contains
+ * Should the JSPs in this group have template text that only contains
* whitespace removed?
*
* @return {@code true} if the whitespace be removed, otherwise
diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java
index 030c13566a..a24e215773 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1807,7 +1807,7 @@ public interface Context extends Container, ContextBind {
/**
* Are paths used in calls to obtain a request dispatcher expected to be
- * encoded? This applys to both how Tomcat handles calls to obtain a request
+ * encoded? This applies to both how Tomcat handles calls to obtain a request
* dispatcher as well as how Tomcat generates paths used to obtain request
* dispatchers internally.
*
diff --git a/java/org/apache/catalina/mapper/MapperListener.java b/java/org/apache/catalina/mapper/MapperListener.java
index fa303c47fc..67be0a7537 100644
--- a/java/org/apache/catalina/mapper/MapperListener.java
+++ b/java/org/apache/catalina/mapper/MapperListener.java
@@ -508,7 +508,7 @@ public class MapperListener extends LifecycleMBeanBase
/**
* Add this mapper to the container and all child containers
*
- * @param container the container (and any associated childern) to which
+ * @param container the container (and any associated children) to which
* the mapper is to be added
*/
private void addListeners(Container container) {
@@ -523,7 +523,7 @@ public class MapperListener extends LifecycleMBeanBase
/**
* Remove this mapper from the container and all child containers
*
- * @param container the container (and any associated childern) from which
+ * @param container the container (and any associated children) from which
* the mapper is to be removed
*/
private void removeListeners(Container container) {
diff --git a/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java b/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java
index 09710ddaf7..3c5fe93a77 100644
--- a/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java
+++ b/java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.res.StringManager;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
* <code>org.apache.catalina.users.SparseUserDatabase</code> component.
- * The main difference is that the MBeans are created on demand (for exemple,
+ * The main difference is that the MBeans are created on demand (for example,
* the findUser method would register the corresponding user and make it
* available for management. All the MBeans created for users, groups and roles
* are then discarded when save is invoked.</p>
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java
index 2f26337a41..a8ca4619f9 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1845,7 +1845,7 @@ public final class CGIServlet extends HttpServlet {
/**
* This is an input stream specifically for reading HTTP headers. It reads
- * upto and including the two blank lines terminating the headers. It
+ * up to and including the two blank lines terminating the headers. It
* allows the content to be read using bytes or characters as appropriate.
*/
protected static class HTTPHeaderInputStream extends InputStream {
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java b/java/org/apache/catalina/tribes/ByteMessage.java
index cd414aaec2..4560d87623 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -51,7 +51,7 @@ public class ByteMessage implements Externalizable {
}
/**
- * Creates a byte message wit h
+ * Creates a byte message with
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 53aa34e483..ad5ee897ef 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -113,7 +113,7 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
(!Arrays.equals(TCP_FAIL_DETECT,msg.getMessage().getBytes()) ) );
}//end if
- //ignore the message, it doesnt have the flag set
+ //ignore the message, it doesn't have the flag set
if ( process ) {
super.messageReceived(msg);
} else if ( log.isDebugEnabled() ) {
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
index 0be78ed547..0cddef05d5 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
@@ -178,7 +178,7 @@ public class TcpPingInterceptor extends ChannelInterceptorBase implements TcpPin
(!Arrays.equals(TCP_PING_DATA,msg.getMessage().getBytes()) ) );
}//end if
- //ignore the message, it doesnt have the flag set
+ //ignore the message, it doesn't have the flag set
if ( process ) {
super.messageReceived(msg);
} else if ( log.isDebugEnabled() ) {
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
index b7983395ff..0b463fe197 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
@@ -64,7 +64,7 @@ public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase {
super.sendMessage(destination,confirmation,payload);
} else {
//turn off two phase commit
- //this wont work if the interceptor has 0 as a flag
+ //this won't work if the interceptor has 0 as a flag
//since there is no flag to turn off
//msg.setOptions(msg.getOptions() & (~getOptionFlag()));
super.sendMessage(destination, msg, payload);
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index ac1571aa88..068a383440 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -84,11 +84,11 @@ public class McastServiceImpl extends MembershipProviderBase {
*/
protected final long sendFrequency;
/**
- * Reuse the sendPacket, no need to create a new one everytime
+ * Reuse the sendPacket, no need to create a new one every time
*/
protected DatagramPacket sendPacket;
/**
- * Reuse the receivePacket, no need to create a new one everytime
+ * Reuse the receivePacket, no need to create a new one every time
*/
protected DatagramPacket receivePacket;
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index cd3c319c4f..3892131481 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -144,7 +144,7 @@ public class DataSourceUserDatabase extends SparseUserDatabase {
/**
- * The column in the role and group tables for the decription
+ * The column in the role and group tables for the description
*/
protected String roleAndGroupDescriptionCol = null;
diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 3930a90c5b..153fae819b 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -123,7 +123,7 @@ public abstract class AbstractFileResourceSet extends AbstractResourceSet {
// - case differences on case insensitive file systems
// - Windows removing a trailing ' ' or '.' from the file name
//
- // In all cases, a mis-match here results in the resource not being
+ // In all cases, a mismatch here results in the resource not being
// found
//
// absPath is normalized so canPath needs to be normalized as well
diff --git a/java/org/apache/coyote/ActionHook.java b/java/org/apache/coyote/ActionHook.java
index 4b4e369b4c..8783048e66 100644
--- a/java/org/apache/coyote/ActionHook.java
+++ b/java/org/apache/coyote/ActionHook.java
@@ -23,7 +23,7 @@ package org.apache.coyote;
* Some standard actions are defined in ActionCode, however custom
* actions are permitted.
*
- * The param object can be used to pass and return informations related with the
+ * The param object can be used to pass and return information related with the
* action.
*
*
diff --git a/java/org/apache/coyote/RequestInfo.java b/java/org/apache/coyote/RequestInfo.java
index 2d2daa1b48..0efb30ffb1 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -23,7 +23,7 @@ import javax.management.ObjectName;
/**
* Structure holding the Request and Response objects. It also holds statistical
- * informations about request processing and provide management informations
+ * information about request processing and provide management information
* about the requests being processed.
*
* Each thread uses a Request/Response pair that is recycled on each request.
diff --git a/java/org/apache/coyote/Response.java b/java/org/apache/coyote/Response.java
index 388ac647f0..b3bd46022c 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -121,7 +121,7 @@ public final class Response {
long contentLength = -1;
private Locale locale = DEFAULT_LOCALE;
- // General informations
+ // General information
private long contentWritten = 0;
private long commitTimeNanos = -1;
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 9a3c1c206c..a67bfec3d5 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -219,7 +219,7 @@ public class Http11Processor extends AbstractProcessor {
setErrorState(ErrorState.CLOSE_CLEAN, null);
if (log.isDebugEnabled()) {
log.debug(sm.getString("http11processor.request.prepare") +
- " Tranfer encoding lists chunked before [" + encodingName + "]");
+ " Transfer encoding lists chunked before [" + encodingName + "]");
}
return;
}
diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index f67b17f7d9..0876fc88c6 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -61,7 +61,7 @@ abstract class AbstractNonZeroStream extends AbstractStream {
* General method used when reprioritising a stream and care needs to be
* taken not to create circular references.
*
- * Changes to the priority tree need to be sychronized at the connection
+ * Changes to the priority tree need to be synchronized at the connection
* level. This is the caller's responsibility.
*/
final void rePrioritise(AbstractStream parent, boolean exclusive, int weight) {
@@ -99,7 +99,7 @@ abstract class AbstractNonZeroStream extends AbstractStream {
* Used when removing closed streams from the tree and we know there is no
* need to check for circular references.
*
- * Changes to the priority tree need to be sychronized at the connection
+ * Changes to the priority tree need to be synchronized at the connection
* level. This is the caller's responsibility.
*/
final void rePrioritise(AbstractStream parent, int weight) {
@@ -121,7 +121,7 @@ abstract class AbstractNonZeroStream extends AbstractStream {
* Replace this stream with the provided stream in the parent/child
* hierarchy.
*
- * Changes to the priority tree need to be sychronized at the connection
+ * Changes to the priority tree need to be synchronized at the connection
* level. This is the caller's responsibility.
*/
void replaceStream(AbstractNonZeroStream replacement) {
diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java
index f37801698c..c05ce36979 100644
--- a/java/org/apache/jasper/compiler/Parser.java
+++ b/java/org/apache/jasper/compiler/Parser.java
@@ -479,7 +479,7 @@ class Parser implements TagConstants {
parseIncludeDirective(parent);
} else if (reader.matches("taglib")) {
if (directivesOnly) {
- // No need to get the tagLibInfo objects. This alos suppresses
+ // No need to get the tagLibInfo objects. This also suppresses
// parsing of any tag files used in this tag file.
return;
}
diff --git a/java/org/apache/jasper/compiler/ServletWriter.java b/java/org/apache/jasper/compiler/ServletWriter.java
index f5d305757e..14d8cbf389 100644
--- a/java/org/apache/jasper/compiler/ServletWriter.java
+++ b/java/org/apache/jasper/compiler/ServletWriter.java
@@ -56,7 +56,7 @@ public class ServletWriter implements AutoCloseable {
}
- // -------------------- Access informations --------------------
+ // -------------------- Access information --------------------
public int getJavaLine() {
return javaLine;
@@ -97,14 +97,14 @@ public class ServletWriter implements AutoCloseable {
}
/**
- * Prints the current indention
+ * Prints the current indentation
*/
public void printin() {
writer.print(SPACES.substring(0, indent));
}
/**
- * Prints the current indention, followed by the given string
+ * Prints the current indentation, followed by the given string
* @param s The string
*/
public void printin(String s) {
@@ -113,7 +113,7 @@ public class ServletWriter implements AutoCloseable {
}
/**
- * Prints the current indention, and then the string, and a '\n'.
+ * Prints the current indentation, and then the string, and a '\n'.
* @param s The string
*/
public void printil(String s) {
diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java b/java/org/apache/jasper/runtime/PageContextImpl.java
index 1477013788..ccdd0d4f6a 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -594,7 +594,7 @@ public class PageContextImpl extends PageContext {
}
@Override
- @SuppressWarnings("deprecation") // Still jave to support old JSP EL
+ @SuppressWarnings("deprecation") // Still have to support old JSP EL
public void handlePageException(final Throwable t) throws IOException, ServletException {
if (t == null) {
throw new NullPointerException(Localizer.getMessage("jsp.error.page.nullThrowable"));
diff --git a/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java b/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
index 03c0f79fdb..c62283abfe 100644
--- a/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
+++ b/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
@@ -59,7 +59,7 @@ public final class ForEach implements TagPlugin {
ctxt.generateJavaSource("; " + index + "++) {");
}
- // If var is specified and the body contains an EL, then sycn
+ // If var is specified and the body contains an EL, then sync
// the var attribute
if (hasVar /* && ctxt.hasEL() */) {
ctxt.generateJavaSource("_jspx_page_context.setAttribute(");
diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 904893a94f..909f3d3c72 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -252,7 +252,7 @@ public class ServiceRefFactory implements ObjectFactory {
break;
}
- // Load all datas relative to the handler : SOAPHeaders, config init element,
+ // Load all data relative to the handler : SOAPHeaders, config init element,
// portNames to be set on
List<QName> headers = new ArrayList<>();
Hashtable<String,String> config = new Hashtable<>();
@@ -288,7 +288,7 @@ public class ServiceRefFactory implements ObjectFactory {
}
}
- // Set the handlers informations
+ // Set the handlers information
handlerInfo.setHandlerClass(handlerClass);
handlerInfo.setHeaders(headers.toArray(new QName[0]));
handlerInfo.setHandlerConfig(config);
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
index 887fb66d38..ebac9834cd 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
@@ -170,7 +170,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
connectionIsClosed = false;
}
try {
- // DBCP-512: Avoid exceptions when closing a connection in mutli-threaded use case.
+ // DBCP-512: Avoid exceptions when closing a connection in multi-threaded use case.
// Avoid closing again, which should be a no-op, but some drivers like H2 throw an exception when
// closing from multiple threads.
if (!connectionIsClosed) {
diff --git a/java/org/apache/tomcat/util/json/ParseException.java b/java/org/apache/tomcat/util/json/ParseException.java
index ea980a7a7e..d569eea154 100644
--- a/java/org/apache/tomcat/util/json/ParseException.java
+++ b/java/org/apache/tomcat/util/json/ParseException.java
@@ -82,7 +82,7 @@ public class ParseException extends Exception {
/**
* This is the last token that has been consumed successfully. If
* this object has been created due to a parse error, the token
- * followng this token will (therefore) be the first error token.
+ * following this token will (therefore) be the first error token.
*/
public Token currentToken;
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index fbd860741f..965c224aad 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -398,7 +398,7 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel>
// With a UDS, expect no delay connecting and no defer accept
socket.connect(sa);
}
- // Wait for upto 1000ms acceptor threads to unlock
+ // Wait for up to 1000ms acceptor threads to unlock
long waitLeft = 1000;
while (waitLeft > 0 &&
acceptor.getState() == AcceptorState.RUNNING) {
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java b/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
index 05a6010ed0..30777d6f78 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
@@ -26,7 +26,7 @@ import javax.net.ssl.X509ExtendedKeyManager;
import javax.net.ssl.X509KeyManager;
/**
- * X509KeyManager which allows selection of a specific keypair and certificate
+ * X509KeyManager which allows selection of a specific key pair and certificate
* chain (identified by their keystore alias name) to be used by the server to
* authenticate itself to SSL clients.
*
@@ -42,7 +42,7 @@ public final class JSSEKeyManager extends X509ExtendedKeyManager {
* Constructor.
*
* @param mgr The X509KeyManager used as a delegate
- * @param serverKeyAlias The alias name of the server's keypair and
+ * @param serverKeyAlias The alias name of the server's key pair and
* supporting certificate chain
*/
public JSSEKeyManager(X509KeyManager mgr, String serverKeyAlias) {
diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index 03abf596d7..443a5a39d8 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -294,7 +294,7 @@ public class PEMFile {
* fragile but acceptable in this case since the JRE depends on
* the toString() implementation as well.
* In the future, if necessary, we can parse the value of
- * paremeters.getEncoded() but the associated complexity and
+ * parameters.getEncoded() but the associated complexity and
* unlikeliness of the JRE implementation changing means that
* Tomcat will use to toString() approach for now.
*/
diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 6b250ee9d3..b799e3664c 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.res.StringManager;
* As task queue specifically designed to run with a thread pool executor. The
* task queue is optimised to properly utilize threads within a thread pool
* executor. If you use a normal queue, the executor will spawn threads when
- * there are idle threads and you wont be able to force items onto the queue
+ * there are idle threads and you won't be able to force items onto the queue
* itself.
*/
public class TaskQueue extends LinkedBlockingQueue<Runnable> {
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
index 37fb7a39a7..1472ec8635 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -1390,7 +1390,7 @@ public class ConnectionPool {
}
/**
- * Tread safe wrapper around a future for the regular queue
+ * Thread safe wrapper around a future for the regular queue
* This one retrieves the pooled connection object
* and performs the initialization according to
* interceptors and validation rules.
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
index 9ba2f991d5..04a263ace2 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
@@ -118,7 +118,7 @@ public abstract class AbstractQueryReport extends AbstractCreateStatementInterce
/**
* returns the query measure threshold.
- * This value is in milliseconds. If the query is faster than this threshold than it wont be accounted for
+ * This value is in milliseconds. If the query is faster than this threshold than it won't be accounted for
* @return the threshold in milliseconds
*/
public long getThreshold() {
diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
index 85b53b3f11..80a9ba883d 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
@@ -54,7 +54,7 @@ public class TestValidation extends DefaultTestCase {
datasource.setMinIdle(1);
datasource.setMaxIdle(1);
datasource.setMaxActive(2);
- // Validation interval is disabled by default to ensure validation occurs everytime
+ // Validation interval is disabled by default to ensure validation occurs every time
datasource.setValidationInterval(-1);
// No validation query by default
datasource.setValidationQuery(null);
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java b/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
index 0f861b7db0..7ffb6e80e2 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
@@ -64,7 +64,7 @@ public class TestWebappClassLoaderExecutorMemoryLeak extends TomcatBaseTest {
// The time taken to shutdown the executor can vary between systems. Try
// to avoid false test failures due to timing issues. Give the executor
- // upto 10 seconds to close down.
+ // up to 10 seconds to close down.
int count = 0;
while (count < 100 && !executorServlet.tpe.isTerminated()) {
count++;
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 8023e8fb68..0db6faa900 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -307,9 +307,9 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
if (resultEnd > resultString.length()) {
resultEnd = resultString.length();
}
- log.error("Mis-match tx: " + new String(
+ log.error("Mismatch tx: " + new String(
DATA, dataStart, dataEnd - dataStart));
- log.error("Mis-match rx: " +
+ log.error("Mismatch rx: " +
resultString.substring(resultStart, resultEnd));
found = true;
break;
@@ -795,9 +795,9 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
int written = 0;
public volatile boolean onErrorInvoked = false;
- public TestWriteListener(AsyncContext ctx, boolean unlimted) {
+ public TestWriteListener(AsyncContext ctx, boolean unlimited) {
this.ctx = ctx;
- this.unlimited = unlimted;
+ this.unlimited = unlimited;
}
@Override
diff --git a/test/org/apache/catalina/tribes/demos/MapDemo.java b/test/org/apache/catalina/tribes/demos/MapDemo.java
index f6c657b8d3..17ba0e829b 100644
--- a/test/org/apache/catalina/tribes/demos/MapDemo.java
+++ b/test/org/apache/catalina/tribes/demos/MapDemo.java
@@ -168,7 +168,7 @@ public class MapDemo implements ChannelListener, MembershipListener{
@Override
public void run() {
System.out.println("Shutting down...");
- //create an exit thread that forces a shutdown if the JVM wont exit cleanly
+ //create an exit thread that forces a shutdown if the JVM won't exit cleanly
SystemExit exit = new SystemExit(5000);
exit.setDaemon(true);
exit.start();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 60afa56b2f..1048b9122f 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1805,7 +1805,7 @@ public class TestHttp11Processor extends TomcatBaseTest {
// Needs to be async to trigger the problematic code path
AsyncContext ac = req.startAsync();
ServletInputStream sis = req.getInputStream();
- // This triggers a call to Http11InputBuffer.avalable(true) which
+ // This triggers a call to Http11InputBuffer.available(true) which
// did not handle the pipelining case.
sis.setReadListener(new Bug64974ReadListener());
ac.complete();
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
index 8d195182d0..b80a8955e2 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1402,7 +1402,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- // Request bodies are unusal with GET but not illegal
+ // Request bodies are unusual with GET but not illegal
doPost(req, resp);
}
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 60c943b0df..e4738ccf6a 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -168,7 +168,7 @@ public class TestCancelledUpload extends Http2TestBase {
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- // Read upto 128 bytes and then return a 403 response
+ // Read up to 128 bytes and then return a 403 response
InputStream is = req.getInputStream();
byte[] buf = new byte[128];
diff --git a/test/org/apache/tomcat/websocket/TestWsSubprotocols.java b/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
index 8bc21fedbc..a08049e2de 100644
--- a/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
+++ b/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
@@ -79,7 +79,7 @@ public class TestWsSubprotocols extends WebSocketBaseTest {
Assert.assertTrue(wsSession.isOpen());
Assert.assertEquals("sp2", wsSession.getNegotiatedSubprotocol());
- // Client thread might move faster than server. Wait for upto 5s for the
+ // Client thread might move faster than server. Wait for up to 5s for the
// subProtocols to be set
int count = 0;
while (count < 50 && SubProtocolsEndpoint.subprotocols == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org