[Bug 64710] NullPointerException in Http2UpgradeHandler.endRequestBodyFrame and BufferOverflowException in SocketBufferHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=64710 --- Comment #17 from Arshiya --- Any update on this please ? Thanks ! -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54709] Official schemes for WebSocket are "ws"/"wss"; WsWebSocketContainer only allows "http"/"https"
https://bz.apache.org/bugzilla/show_bug.cgi?id=54709 Chaitanya Kiran changed: What|Removed |Added CC||padala.chaita...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.106
On Wed, Sep 16, 2020 at 1:26 PM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.106 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.106/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1279/ > The git tag is: > https://github.com/apache/tomcat/tree/7.0.106 > c5d9010a75e99a69f59ba11cc1116d039a113979 > > The proposed 7.0.106 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.106 Stable > > Rémy
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2469 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 85cabed2a2f4f24a7a3b1fd8da5aa1050e3cdfbd Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #363: Fix Chinese translation of word "war"
markt-asf commented on pull request #363: URL: https://github.com/apache/tomcat/pull/363#issuecomment-693591582 Note to Tomcat committers. If you merge PRs like this you need to be careful because poeditor.com is the master copy for translations. You need to: - import the latest translations from poeditor - apply the PR - export the translations to poeditor (and check it only changes translations affected by the PR) In some cases it may be easier to manually apply the changes in poeditor and import. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] nicholasgribanov opened a new pull request #365: Added Russian LocalStrings_ru.properties for standardWrapper
nicholasgribanov opened a new pull request #365: URL: https://github.com/apache/tomcat/pull/365 Added Russian translate to LocalStrings_ru.properties for standardWrapper This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #362: Fix spelling
markt-asf commented on pull request #362: URL: https://github.com/apache/tomcat/pull/362#issuecomment-693582639 There were fewer API changes than expected the changes in the PR have been applied excluding the DTD/schema files identified above. If you could rebase the PR and confirm nothing has been missed that would be great. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix spelling
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
The following commit(s) were added to refs/heads/7.0.x by this push:
new d7c4d46 Fix spelling
d7c4d46 is described below
commit d7c4d4652c4a136a6bd26245273c9bf572406b9e
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:25:33 2020 +0100
Fix spelling
No need for backwards compatibility changes. The new name is now
consistent with the documentation. Any users relying on the old spelling
can configure the attribute name explicitly.
---
java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 15bc254..7adf38c 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -116,7 +116,7 @@ public class JvmRouteBinderValve extends ValveBase
implements ClusterValve {
*/
protected long numberOfSessions = 0;
-protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOrignalSessionID";
+protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOriginalSessionID";
/*--Logic---*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix spelling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 85cabed Fix spelling
85cabed is described below
commit 85cabed2a2f4f24a7a3b1fd8da5aa1050e3cdfbd
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:25:33 2020 +0100
Fix spelling
No need for backwards compatibility changes. The new name is now
consistent with the documentation. Any users relying on the old spelling
can configure the attribute name explicitly.
---
java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 5505c9f..055fa74 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -99,7 +99,7 @@ public class JvmRouteBinderValve extends ValveBase implements
ClusterValve {
*/
protected long numberOfSessions = 0;
-protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOrignalSessionID";
+protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOriginalSessionID";
/*--Logic---*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix spelling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 13315a1 Fix spelling
13315a1 is described below
commit 13315a1f5cb1921ff13ced6b53086ca59ca5fa86
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:25:33 2020 +0100
Fix spelling
No need for backwards compatibility changes. The new name is now
consistent with the documentation. Any users relying on the old spelling
can configure the attribute name explicitly.
---
java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 5505c9f..055fa74 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -99,7 +99,7 @@ public class JvmRouteBinderValve extends ValveBase implements
ClusterValve {
*/
protected long numberOfSessions = 0;
-protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOrignalSessionID";
+protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOriginalSessionID";
/*--Logic---*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix spelling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 810f42c Fix spelling
810f42c is described below
commit 810f42c4cce17bae4987c75017b8909033813071
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:25:33 2020 +0100
Fix spelling
No need for backwards compatibility changes. The new name is now
consistent with the documentation. Any users relying on the old spelling
can configure the attribute name explicitly.
---
java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 66fd439..55201f6 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -99,7 +99,7 @@ public class JvmRouteBinderValve extends ValveBase implements
ClusterValve {
*/
protected long numberOfSessions = 0;
-protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOrignalSessionID";
+protected String sessionIdAttribute =
"org.apache.catalina.ha.session.JvmRouteOriginalSessionID";
/*--Logic---*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: MBean needed fixes too.
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 The following commit(s) were added to refs/heads/7.0.x by this push: new b83ebba MBean needed fixes too. b83ebba is described below commit b83ebbaf4c0f53eb4240e059859f3e00d6bdcca0 Author: Mark Thomas AuthorDate: Wed Sep 16 19:19:54 2020 +0100 MBean needed fixes too. --- java/org/apache/catalina/ha/session/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml index c334c25..2c4d40c 100644 --- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml @@ -102,7 +102,7 @@ type="java.lang.String" writeable="false"/> @@ -297,7 +297,7 @@ type="java.lang.String" writeable="false"/>
[tomcat] branch 9.0.x updated: MBean needed fixes too.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 4e78b4d MBean needed fixes too. 4e78b4d is described below commit 4e78b4d176f27e86adb646de8c328b317f8cd6ff Author: Mark Thomas AuthorDate: Wed Sep 16 19:19:54 2020 +0100 MBean needed fixes too. --- java/org/apache/catalina/ha/session/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml index a7427c9..c3df0ed 100644 --- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml @@ -80,7 +80,7 @@ type="java.lang.String" writeable="false"/> @@ -258,7 +258,7 @@ type="java.lang.String" writeable="false"/>
[tomcat] branch 8.5.x updated: MBean needed fixes too.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 55694bf MBean needed fixes too. 55694bf is described below commit 55694bf4361ba486bdf782bcbad81e47e1a82306 Author: Mark Thomas AuthorDate: Wed Sep 16 19:19:54 2020 +0100 MBean needed fixes too. --- java/org/apache/catalina/ha/session/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml index 80f4464..6d039c9 100644 --- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml @@ -80,7 +80,7 @@ type="java.lang.String" writeable="false"/> @@ -258,7 +258,7 @@ type="java.lang.String" writeable="false"/>
[tomcat] branch master updated (26f2c2a -> 20a0ab2)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 26f2c2a Remove deprecated code new 3f4a47d MBean needed fixes too. new 20a0ab2 MBean needed fixes too. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/ha/session/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: MBean needed fixes too.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 3f4a47d268e5f2b471028bf98ffd701fe0ccb847 Author: Mark Thomas AuthorDate: Wed Sep 16 19:19:54 2020 +0100 MBean needed fixes too. --- java/org/apache/catalina/ha/session/mbeans-descriptors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml index a7427c9..c3df0ed 100644 --- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml @@ -80,7 +80,7 @@ type="java.lang.String" writeable="false"/> @@ -258,7 +258,7 @@ type="java.lang.String" writeable="false"/>
[tomcat] 02/02: MBean needed fixes too.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 20a0ab2ea3d2e0793f986945f0d2d1aa4b420d2e Author: Mark Thomas AuthorDate: Wed Sep 16 19:19:54 2020 +0100 MBean needed fixes too. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 26f2c2a Remove deprecated code
26f2c2a is described below
commit 26f2c2a084503445a7cfed88400e2cb022cbcf57
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:16:55 2020 +0100
Remove deprecated code
---
.../apache/catalina/ha/session/DeltaManager.java | 31 --
1 file changed, 31 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index d048561..608ae8f 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -266,16 +266,6 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return Returns the counterNoStateTransferred.
- * @deprecated Use {@link #getCounterNoStateTransferred()}. Will be removed
- * in Tomcat 10 onwards.
- */
-@Deprecated
-public int getCounterNoStateTransfered() {
-return getCounterNoStateTransferred();
-}
-
-/**
- * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransferred() {
return counterNoStateTransferred;
@@ -300,27 +290,6 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return true if the state transfer is complete.
- * @deprecated Use {@link #getStateTransferred()}. Will be removed in
Tomcat
- * 10 onwards.
- */
-@Deprecated
-public boolean getStateTransfered() {
-return getStateTransferred();
-}
-
-/**
- * Set that state transferred is complete
- * @param stateTransferred Flag value
- * @deprecated Use {@link #setStateTransferred(boolean)}. Will be removed
in
- * Tomcat 10 onwards.
- */
-@Deprecated
-public void setStateTransfered(boolean stateTransferred) {
-setStateTransferred(stateTransferred);
-}
-
-/**
- * @return true if the state transfer is complete.
*/
public boolean getStateTransferred() {
return stateTransferred;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix spelling without breaking API
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new aa53cfa Fix spelling without breaking API
aa53cfa is described below
commit aa53cfa63366e51b60581099ac8ef31905f9946f
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:13:48 2020 +0100
Fix spelling without breaking API
---
.../apache/catalina/ha/session/DeltaManager.java | 37 --
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 6e692ef..6d85a9f 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -271,8 +271,18 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return Returns the counterNoStateTransferred.
+ * @deprecated Use {@link #getCounterNoStateTransferred()}. Will be removed
+ * in Tomcat 10 onwards.
*/
+@Deprecated
public int getCounterNoStateTransfered() {
+return getCounterNoStateTransferred();
+}
+
+/**
+ * @return Returns the counterNoStateTransferred.
+ */
+public int getCounterNoStateTransferred() {
return counterNoStateTransferred;
}
@@ -295,16 +305,37 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return true if the state transfer is complete.
+ * @deprecated Use {@link #getStateTransferred()}. Will be removed in
Tomcat
+ * 10 onwards.
*/
+@Deprecated
public boolean getStateTransfered() {
-return stateTransferred;
+return getStateTransferred();
}
/**
* Set that state transferred is complete
* @param stateTransferred Flag value
+ * @deprecated Use {@link #setStateTransferred(boolean)}. Will be removed
in
+ * Tomcat 10 onwards.
*/
+@Deprecated
public void setStateTransfered(boolean stateTransferred) {
+setStateTransferred(stateTransferred);
+}
+
+/**
+ * @return true if the state transfer is complete.
+ */
+public boolean getStateTransferred() {
+return stateTransferred;
+}
+
+/**
+ * Set that state transferred is complete
+ * @param stateTransferred Flag value
+ */
+public void setStateTransferred(boolean stateTransferred) {
this.stateTransferred = stateTransferred;
}
@@ -851,7 +882,7 @@ public class DeltaManager extends ClusterManagerBase{
}
reqNow = System.currentTimeMillis();
isTimeout = ((reqNow - reqStart) > (1000L *
getStateTransferTimeout()));
-} while ((!getStateTransfered()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
} else {
if(getStateTransferTimeout() == -1) {
// wait that state is transferred
@@ -860,7 +891,7 @@ public class DeltaManager extends ClusterManagerBase{
Thread.sleep(100);
} catch (Exception sleep) {
}
-} while ((!getStateTransfered())&&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred())&&
(!isNoContextManagerReceived()));
reqNow = System.currentTimeMillis();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix spelling without breaking API
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
The following commit(s) were added to refs/heads/7.0.x by this push:
new f978935 Fix spelling without breaking API
f978935 is described below
commit f978935d342088b93bfb2b5dddbe20277cd2b4c2
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:13:48 2020 +0100
Fix spelling without breaking API
---
.../apache/catalina/ha/session/DeltaManager.java | 37 --
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 7a7cc93..9d4c9a1 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -287,8 +287,18 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return Returns the counterNoStateTransferred.
+ * @deprecated Use {@link #getCounterNoStateTransferred()}. Will be removed
+ * in Tomcat 10 onwards.
*/
+@Deprecated
public int getCounterNoStateTransfered() {
+return getCounterNoStateTransferred();
+}
+
+/**
+ * @return Returns the counterNoStateTransferred.
+ */
+public int getCounterNoStateTransferred() {
return counterNoStateTransferred;
}
@@ -311,16 +321,37 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return true if the state transfer is complete.
+ * @deprecated Use {@link #getStateTransferred()}. Will be removed in
Tomcat
+ * 10 onwards.
*/
+@Deprecated
public boolean getStateTransfered() {
-return stateTransferred;
+return getStateTransferred();
}
/**
* Set that state transferred is complete
* @param stateTransferred Flag value
+ * @deprecated Use {@link #setStateTransferred(boolean)}. Will be removed
in
+ * Tomcat 10 onwards.
*/
+@Deprecated
public void setStateTransfered(boolean stateTransferred) {
+setStateTransferred(stateTransferred);
+}
+
+/**
+ * @return true if the state transfer is complete.
+ */
+public boolean getStateTransferred() {
+return stateTransferred;
+}
+
+/**
+ * Set that state transferred is complete
+ * @param stateTransferred Flag value
+ */
+public void setStateTransferred(boolean stateTransferred) {
this.stateTransferred = stateTransferred;
}
@@ -896,7 +927,7 @@ public class DeltaManager extends ClusterManagerBase{
}
reqNow = System.currentTimeMillis();
isTimeout = ((reqNow - reqStart) > (1000L *
getStateTransferTimeout()));
-} while ((!getStateTransfered()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
} else {
if(getStateTransferTimeout() == -1) {
// wait that state is transferred
@@ -905,7 +936,7 @@ public class DeltaManager extends ClusterManagerBase{
Thread.sleep(100);
} catch (Exception sleep) {
}
-} while ((!getStateTransfered())&&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred())&&
(!isNoContextManagerReceived()));
reqNow = System.currentTimeMillis();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix spelling without breaking API
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3f26bed Fix spelling without breaking API
3f26bed is described below
commit 3f26bed456b324e9fdcbea7b404f98ec638a2a30
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:13:48 2020 +0100
Fix spelling without breaking API
---
.../apache/catalina/ha/session/DeltaManager.java | 37 --
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 7f39989..f0b797e 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -266,8 +266,18 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return Returns the counterNoStateTransferred.
+ * @deprecated Use {@link #getCounterNoStateTransferred()}. Will be removed
+ * in Tomcat 10 onwards.
*/
+@Deprecated
public int getCounterNoStateTransfered() {
+return getCounterNoStateTransferred();
+}
+
+/**
+ * @return Returns the counterNoStateTransferred.
+ */
+public int getCounterNoStateTransferred() {
return counterNoStateTransferred;
}
@@ -290,16 +300,37 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return true if the state transfer is complete.
+ * @deprecated Use {@link #getStateTransferred()}. Will be removed in
Tomcat
+ * 10 onwards.
*/
+@Deprecated
public boolean getStateTransfered() {
-return stateTransferred;
+return getStateTransferred();
}
/**
* Set that state transferred is complete
* @param stateTransferred Flag value
+ * @deprecated Use {@link #setStateTransferred(boolean)}. Will be removed
in
+ * Tomcat 10 onwards.
*/
+@Deprecated
public void setStateTransfered(boolean stateTransferred) {
+setStateTransferred(stateTransferred);
+}
+
+/**
+ * @return true if the state transfer is complete.
+ */
+public boolean getStateTransferred() {
+return stateTransferred;
+}
+
+/**
+ * Set that state transferred is complete
+ * @param stateTransferred Flag value
+ */
+public void setStateTransferred(boolean stateTransferred) {
this.stateTransferred = stateTransferred;
}
@@ -852,7 +883,7 @@ public class DeltaManager extends ClusterManagerBase{
}
reqNow = System.currentTimeMillis();
isTimeout = ((reqNow - reqStart) > (1000L *
getStateTransferTimeout()));
-} while ((!getStateTransfered()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
} else {
if(getStateTransferTimeout() == -1) {
// wait that state is transferred
@@ -861,7 +892,7 @@ public class DeltaManager extends ClusterManagerBase{
Thread.sleep(100);
} catch (Exception sleep) {
}
-} while ((!getStateTransfered())&&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred())&&
(!isNoContextManagerReceived()));
reqNow = System.currentTimeMillis();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix spelling without breaking API
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c47fe61 Fix spelling without breaking API
c47fe61 is described below
commit c47fe61fd9242cff762fc5174a2cc7a6ac8d5a7e
Author: Mark Thomas
AuthorDate: Wed Sep 16 19:13:48 2020 +0100
Fix spelling without breaking API
---
.../apache/catalina/ha/session/DeltaManager.java | 37 --
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 6155820..d048561 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -266,8 +266,18 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return Returns the counterNoStateTransferred.
+ * @deprecated Use {@link #getCounterNoStateTransferred()}. Will be removed
+ * in Tomcat 10 onwards.
*/
+@Deprecated
public int getCounterNoStateTransfered() {
+return getCounterNoStateTransferred();
+}
+
+/**
+ * @return Returns the counterNoStateTransferred.
+ */
+public int getCounterNoStateTransferred() {
return counterNoStateTransferred;
}
@@ -290,16 +300,37 @@ public class DeltaManager extends ClusterManagerBase{
/**
* @return true if the state transfer is complete.
+ * @deprecated Use {@link #getStateTransferred()}. Will be removed in
Tomcat
+ * 10 onwards.
*/
+@Deprecated
public boolean getStateTransfered() {
-return stateTransferred;
+return getStateTransferred();
}
/**
* Set that state transferred is complete
* @param stateTransferred Flag value
+ * @deprecated Use {@link #setStateTransferred(boolean)}. Will be removed
in
+ * Tomcat 10 onwards.
*/
+@Deprecated
public void setStateTransfered(boolean stateTransferred) {
+setStateTransferred(stateTransferred);
+}
+
+/**
+ * @return true if the state transfer is complete.
+ */
+public boolean getStateTransferred() {
+return stateTransferred;
+}
+
+/**
+ * Set that state transferred is complete
+ * @param stateTransferred Flag value
+ */
+public void setStateTransferred(boolean stateTransferred) {
this.stateTransferred = stateTransferred;
}
@@ -771,7 +802,7 @@ public class DeltaManager extends ClusterManagerBase{
}
reqNow = System.currentTimeMillis();
isTimeout = ((reqNow - reqStart) > (1000L *
getStateTransferTimeout()));
-} while ((!getStateTransfered()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
} else {
if(getStateTransferTimeout() == -1) {
// wait that state is transferred
@@ -780,7 +811,7 @@ public class DeltaManager extends ClusterManagerBase{
Thread.sleep(100);
} catch (Exception sleep) {
}
-} while ((!getStateTransfered())&&
(!isNoContextManagerReceived()));
+} while ((!getStateTransferred())&&
(!isNoContextManagerReceived()));
reqNow = System.currentTimeMillis();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Fix spellings in code forked from Commons
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 f612f1c7c3ee6c4340020dc9f893df2410497992
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 9665312..59a81f4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -52,7 +52,7 @@ public interface FileItemIterator {
* By default, this value will be copied from the {@link
FileUploadBase#getSizeMax()
* FileUploadBase} object, however, the user may replace the default value
with a
* request specific value by invoking {@link #setSizeMax(long)} on this
object.
- * @return The maximum size of the complete HTTP requqest. The value -1
indicates "unlimited".
+ * @return The maximum size of the complete HTTP request. The value -1
indicates "unlimited".
*/
public long getSizeMax();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Fix spellings in docs
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 d897288e65a61fa078bc096fad2cf0e629a72e16 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cgi-howto.xml| 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml| 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/http.xml | 6 +++--- webapps/docs/default-servlet.xml | 2 +- webapps/docs/ssi-howto.xml| 4 ++-- webapps/docs/web-socket-howto.xml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 1c4feb7..37f0488 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 17c6031..561c85e 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -258,7 +258,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index a7653cd..d29c2e6 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -240,7 +240,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index 043bc6b..89be5f0 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index a0d27ca..9c0fdc2 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -275,7 +275,7 @@ Tomcat normalises sequences of multiple / characters in -a URI to a single /. This is for consistencuy with the +a URI to a single /. This is for consistency with the behaviour of file systems as URIs are often translated to file system paths. As a result, the return value of HttpServletRequest#getContextPath() is expected to start diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 96a9715..40a5254 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -534,7 +534,7 @@ - This flag configures whether resources with a stong ETag will be + This flag configures whether resources with a strong ETag will be considered for compression. If true, resources with a
[tomcat] 05/06: Fix spellings in modules
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 9f507afe1d0c92c9f1cd79eeacfbd19460499964 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 360ba43..44e2a13 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -870,7 +870,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 02/06: Fix spellings in unit tests
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 adb5fa2b856aeb4bfa1cf8ddba452ac4cbb0dd6d
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
.../catalina/startup/TestTomcatNoServer.java | 4 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 6 +--
test/org/apache/juli/TestFileHandler.java | 44 --
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 7 ++--
5 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/test/org/apache/catalina/startup/TestTomcatNoServer.java
b/test/org/apache/catalina/startup/TestTomcatNoServer.java
index d2d61d9..c5678c1 100644
--- a/test/org/apache/catalina/startup/TestTomcatNoServer.java
+++ b/test/org/apache/catalina/startup/TestTomcatNoServer.java
@@ -71,7 +71,7 @@ public class TestTomcatNoServer {
System.out.println("Missing in embedded: [" + missingExtension
+
"]-[" + webXmlMimeMappings.get(missingExtension) +
"]");
}
-Assert.fail("Embedded is missing [" + missingInEmbedded.size() +
"] entires compared to conf/web.xml");
+Assert.fail("Embedded is missing [" + missingInEmbedded.size() +
"] entries compared to conf/web.xml");
}
// Find entries present in embedded that are missing in conf/web.xml
@@ -82,7 +82,7 @@ public class TestTomcatNoServer {
System.out.println("Missing in embedded: [" + missingExtension
+
"]-[" + ctx.findMimeMapping(missingExtension) + "]");
}
-Assert.fail("Embedded is missing [" + missingInWebXml.size() + "]
entires compared to conf/web.xml");
+Assert.fail("Embedded is missing [" + missingInWebXml.size() + "]
entries compared to conf/web.xml");
}
}
}
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 4b70678..557396c 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -642,7 +642,7 @@ public class TestRemoteIpValve {
// PREPARE
String incomingScheme = arrivesAsSecure ? "https" : "http";
String expectedScheme = shouldBeSecure ? "https" : "http";
-int incommingServerPort = arrivesAsSecure ? 8443 : 8080;
+int incomingServerPort = arrivesAsSecure ? 8443 : 8080;
int expectedServerPort = shouldBeSecure ? 443 : 80;
RemoteIpValve remoteIpValve = new RemoteIpValve();
remoteIpValve.setRemoteIpHeader("x-forwarded-for");
@@ -659,7 +659,7 @@ public class TestRemoteIpValve {
// protocol
request.getCoyoteRequest().getMimeHeaders().addValue("x-forwarded-proto").setString(incomingHeaderValue);
request.setSecure(arrivesAsSecure);
-request.setServerPort(incommingServerPort);
+request.setServerPort(incomingServerPort);
request.getCoyoteRequest().scheme().setString(incomingScheme);
// TEST
@@ -701,7 +701,7 @@ public class TestRemoteIpValve {
Boolean.valueOf(arrivesAsSecure),
Boolean.valueOf(actualPostInvokeSecure));
int actualPostInvokeServerPort = request.getServerPort();
-Assert.assertEquals("postInvoke serverPort", incommingServerPort,
actualPostInvokeServerPort);
+Assert.assertEquals("postInvoke serverPort", incomingServerPort,
actualPostInvokeServerPort);
String actualPostInvokeScheme = request.getScheme();
Assert.assertEquals("postInvoke scheme", incomingScheme,
actualPostInvokeScheme);
diff --git a/test/org/apache/juli/TestFileHandler.java
b/test/org/apache/juli/TestFileHandler.java
index 6128d67..465231e 100644
--- a/test/org/apache/juli/TestFileHandler.java
+++ b/test/org/apache/juli/TestFileHandler.java
@@ -33,8 +33,8 @@ public class TestFileHandler {
private static final String PREFIX_2 = "test.";
private static final String PREFIX_3 = "";
private static final String PREFIX_4 = "localhost1";
-private static final String SUFIX_1 = ".log";
-private static final String SUFIX_2 = ".txt";
+private static final String SUFFIX_1 = ".log";
+private static final String SUFFIX_2 = ".txt";
private File logsDir;
@@ -46,17 +46,19 @@ public class TestFileHandler {
Assert.fail("Unable to create logs directory.");
}
-generateLogFiles(logsDir, PREFIX_1, SUFIX_2, 3);
-generateLogFiles(logsDir, PREFIX_2, SUFIX_1, 3);
-generateLogFiles(logsDir, PREFIX_3, SUFIX_1, 3);
-generateLogFiles(logsDir, PREFIX_4, SUFIX_1, 3);
+generateLogFiles(logsDir, PREFIX_1, SUFFIX_2, 3);
+
[tomcat] 06/06: Fix spellings
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 753d03fd2bd6daf0e1d65d889fdc853c434b161e
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don't affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 8877ffe..7a7cc93 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -84,7 +84,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -120,7 +120,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -286,10 +286,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -313,15 +313,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -817,7 +817,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -910,7 +910,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1114,7 +1114,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1276,7 +1276,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1435,7 +1435,7 @@ public class
[tomcat] 04/06: Fix spellings in docs
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 71bb6d546927212224204eef4cd4ef911b469d97
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in docs
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java| 2 +-
java/org/apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html | 6 +++---
java/org/apache/tomcat/util/modeler/modules/package.html| 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java| 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index f253f93..66650c8 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -254,7 +254,7 @@ class Jre9Compat extends Jre8Compat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index e7a3b4f..32835c5 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -386,7 +386,7 @@ public class JreCompat {
* @return {code true} if the AccessibleObject can be accessed otherwise
* {code false}
*/
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
// Java 8 doesn't support modules so default to true
return true;
}
diff --git a/java/org/apache/tomcat/util/digester/ArrayStack.java
b/java/org/apache/tomcat/util/digester/ArrayStack.java
index d0fdaa6..29b1037 100644
--- a/java/org/apache/tomcat/util/digester/ArrayStack.java
+++ b/java/org/apache/tomcat/util/digester/ArrayStack.java
@@ -23,7 +23,7 @@ import java.util.EmptyStackException;
* Imported copy of the ArrayStack class from
* Commons Collections, which was the only direct dependency from Digester.
*
- * WARNNG - This class is public solely to allow it to be
+ * WARNING - This class is public solely to allow it to be
* used from subpackages of org.apache.commons.digester.
* It should not be considered part of the public API of Commons Digester.
* If you want to use such a class yourself, you should use the one from
diff --git a/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
b/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
index ab6856b..8e873b3 100644
--- a/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
+++ b/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
@@ -37,7 +37,7 @@ public interface ObjectCreationFactory {
* object based on the element's attributes.
*
* @param attributes the element's attributes
- *
+ * @return the created object
* @throws Exception any exception thrown will be propagated upwards
*/
public Object createObject(Attributes attributes) throws Exception;
diff --git a/java/org/apache/tomcat/util/digester/package.html
b/java/org/apache/tomcat/util/digester/package.html
index 6446504..c7d0d06 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -255,7 +255,7 @@ features of the Digester functionality:
parser is that the Digester automatically navigates the element hierarchy of
the XML document you are parsing for you, without requiring any developer
attention to this process. Instead, you focus on deciding what functions you
-would like to have performed whenver a certain arrangement of nested elements
+would like to have performed whenever a certain arrangement of nested elements
is encountered in the XML document being parsed. The mechanism for specifying
such arrangements are called element matching patterns.
@@ -977,7 +977,7 @@ public class MyRuleSet extends RuleSetBase {
The application that is using these rules does not need to know anything
about the fact that the RuleSet being used is associated
-with a particular namespace URI. That knowledge is emedded inside the
+with a particular namespace URI. That knowledge is embedded inside the
RuleSet class itself.
If desired, you could make a set of rules work for more
[tomcat] branch 7.0.x updated (db6c2e7 -> 753d03f)
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 db6c2e7 Fix spelling in coyote, el, jasper and naming new f612f1c Fix spellings in code forked from Commons new adb5fa2 Fix spellings in unit tests new d897288 Fix spellings in docs new 71bb6d5 Fix spellings in docs new 9f507af Fix spellings in modules new 753d03f Fix spellings 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: .../apache/catalina/ha/session/DeltaManager.java | 26 ++--- .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 +-- .../catalina/ha/session/LocalStrings_es.properties | 4 +- .../catalina/ha/session/LocalStrings_fr.properties | 4 +- .../catalina/ha/session/LocalStrings_ja.properties | 4 +- .../catalina/ha/session/LocalStrings_ko.properties | 4 +- .../ha/session/LocalStrings_zh_CN.properties | 4 +- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 +-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +- .../jdbc/pool/interceptor/StatementFinalizer.java | 3 +- .../catalina/startup/TestTomcatNoServer.java | 4 +- .../apache/catalina/valves/TestRemoteIpValve.java | 6 +-- test/org/apache/juli/TestFileHandler.java | 44 -- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 7 ++-- webapps/docs/cgi-howto.xml | 4 +- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/http.xml | 6 +-- webapps/docs/default-servlet.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +- webapps/docs/web-socket-howto.xml | 2 +- 37 files changed, 91 insertions(+), 89 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 53ecac96b140b8c2b3fd655593b05cac3c64f19e
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index dcb5c9c..eff3e16 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1579,7 +1579,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[GitHub] [tomcat] kamnani commented on a change in pull request #352: Optimizing Resource Lookup using Bloom Filter
kamnani commented on a change in pull request #352:
URL: https://github.com/apache/tomcat/pull/352#discussion_r489619352
##
File path: java/org/apache/catalina/webresources/JarContents.java
##
@@ -0,0 +1,122 @@
+package org.apache.catalina.webresources;
+
+import java.util.BitSet;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+/**
+ * This class represents the contents of a jar by determining whether a given
+ * resource might be in the cache, based on a bloom filter. This is not
a
+ * general-purpose bloom filter because it contains logic to strip out
+ * characters from the beginning of the key.
+ *
+ * The hash methods are simple but good enough for this purpose.
+ */
+public final class JarContents {
+private final BitSet bits1;
+private final BitSet bits2;
+/**
+ * Constant used by a typical hashing method.
+ */
+private static final int HASH_PRIME_1 = 31;
+
+/**
+ * Constant used by a typical hashing method.
+ */
+private static final int HASH_PRIME_2 = 17;
+
+/**
+ * Size of the fixed-length bit table. Larger reduces false positives,
+ * smaller saves memory.
+ */
+private static final int TABLE_SIZE = 2048;
+
+/**
+ * Parses the passed-in jar and populates the bit array.
+ *
+ * @param jar
+ */
+public JarContents(JarFile jar) {
+Enumeration entries = jar.entries();
+bits1 = new BitSet(TABLE_SIZE);
+bits2 = new BitSet(TABLE_SIZE);
+
+// Enumerations. When will they update this API?!
+while (entries.hasMoreElements()) {
+JarEntry entry = entries.nextElement();
+String name = entry.getName();
+int startPos = 0;
+
+// If the path starts with a slash, that's not useful information.
+// Skipping it increases the significance of our key by
+// removing an insignificant character.
+boolean precedingSlash = name.charAt(0) == '/';
+if (precedingSlash) {
+startPos = 1;
+}
+
+// Find the correct table slot
+int pathHash1 = hashcode(name, startPos, HASH_PRIME_1);
+int pathHash2 = hashcode(name, startPos, HASH_PRIME_2);
+
+bits1.set(pathHash1 % TABLE_SIZE);
+bits2.set(pathHash2 % TABLE_SIZE);
+}
+}
+
+/**
+ * Simple hashcode of a portion of the string. Typically we would use
+ * substring, but memory and runtime speed are critical.
+ *
+ * @param content
+ *Wrapping String.
+ * @param startPos
+ *First character in the range.
+ * @return hashcode of the range.
+ */
+private int hashcode(String content, int startPos, int hashPrime) {
+int h = hashPrime/2;
+int contentLength = content.length();
+for (int i = startPos; i < contentLength; i++) {
+h = hashPrime * h + content.charAt(i);
+}
+
+if (h < 0) {
+h = h * -1;
+}
+return h;
+}
+
+
+/**
+ * Method that identifies whether a given path MIGHT be in this jar.
+ * Uses the Bloom filter mechanism.
+ *
+ * @param path
+ *Requested path. Sometimes starts with "/WEB-INF/classes".
+ * @param webappRoot
+ *The value of the webapp location, which can be stripped from
+ *the path. Typically is "/WEB-INF/classes".
+ * @return Whether the prefix of the path is known to be in this jar.
+ */
+public final boolean mightContainResource(String path, String webappRoot) {
+int startPos = 0;
+if (path.startsWith(webappRoot)) {
+startPos = webappRoot.length();
+}
+
+if (path.charAt(startPos) == '/') {
+// ignore leading slash
+startPos++;
+}
+
+// Find the correct table slot
+int pathHash1 = hashcode(path, startPos, HASH_PRIME_1);
+int pathHash2 = hashcode(path, startPos, HASH_PRIME_2);
+boolean probablyPresent = (bits1.get(pathHash1 % TABLE_SIZE) &&
bits2.get(pathHash2 % TABLE_SIZE));
Review comment:
Thanks for the suggestion @FSchumacher
I have made this change in the latest commit.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b9c41057a7d747ce5428809401cd6d94867b0e6f Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 59c979d..d96e287 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -912,7 +912,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b1cd6181aa27c0bfc9054a484889050060b7d31
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 70a052a..dcb5c9c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -466,7 +466,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 4673dca22fe3ad1b681e479f1cba394f6154dc80 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index ba2e9a2..77327a1 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1077,7 +1077,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d62277e40e3936d87179f8bcced136f4db53d58c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index d3ec97c..3ba68af 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -423,7 +423,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index f551ca6..0f66453 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends Jre8Compat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 5cb26d2..e61dd03 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -232,7 +232,7 @@ public class JreCompat {
* @return {code
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 44784a731efa6ae7cb96491498f6bea6679d033d Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 852b83b..b1ed993 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -917,7 +917,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ae377a330342f7007e89041e73f3cd6eb9e13ca8 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index a0b0c8e..f443a11 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -262,7 +262,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 873ff75..37802d4 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -275,7 +275,7 @@ Tomcat normalises sequences of multiple / characters in -a URI to a single /. This is for consistencuy with the +a URI to a single /. This is for consistency with the behaviour of file systems as URIs are often translated to file system paths. As a result, the return value of HttpServletRequest#getContextPath() is expected to start diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml index e9e26ef..35b533e 100644 ---
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 53ecac96b140b8c2b3fd655593b05cac3c64f19e
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index dcb5c9c..eff3e16 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1579,7 +1579,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3b1f523ced4d00f83b1a3b865f78557b86bfad93
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 31faa61..3845a17 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -455,7 +455,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e146e75e09bac129dc8d2f7a296e647f188e05a0 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cdi.xml | 2 +- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml index e9cea2c..5ffa564 100644 --- a/webapps/docs/cdi.xml +++ b/webapps/docs/cdi.xml @@ -68,7 +68,7 @@ mvn clean && mvn package]]> The listener will produce a non fatal error if the CDI container loading fails. CDI support can also be enabled at the individual webapp level by adding -the following listner to the webapp context.xml file nested +the following listener to the webapp context.xml file nested inside the Server element: diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index eecbc01..9d78dbf 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -263,7 +263,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 696cbc4..e1ddd20 100644 ---
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e23d382a023f145dca38c637f61ee2c70c799ca
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/json/JSONParser.jj | 2 +-
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
17 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index 6652381..d05cc8b 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -449,7 +449,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index 8e0812c..11122fa 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends JreCompat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 8275e60..099ee87 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d62277e40e3936d87179f8bcced136f4db53d58c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index d3ec97c..3ba68af 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -423,7 +423,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index f551ca6..0f66453 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends Jre8Compat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 5cb26d2..e61dd03 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -232,7 +232,7 @@ public class JreCompat {
* @return {code
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 4 +--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
13 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
}
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean
expect200)
throws Exception {
// Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
ByteChunk bc = new ByteChunk();
Map> reqHeaders = new HashMap<>();
reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" +
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" +
[tomcat] branch 9.0.x updated (ac3a90c -> 377bc85)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ac3a90c Fix spelling in coyote, el, jasper and naming new 3b1f523 Fix spellings in code forked from Commons new f899221 Fix spellings in unit tests new e146e75 Fix spellings in docs new bc2a905 Fix spellings new 4e23d38 Fix spellings in o.a.tomcat new 44784a7 Fix spellings in modules new e735742 Fix one spelling missed on first pass new 377bc85 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- java/org/apache/tomcat/util/json/JSONParser.jj | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- test/javax/el/TestArrayELResolver.java | 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 6 ++-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../util/TestContextNameExtractFromPath.java | 2 +- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cdi.xml | 2 +- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 67 files changed, 135 insertions(+), 135 deletions(-)
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 4 +--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
13 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
}
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean
expect200)
throws Exception {
// Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
ByteChunk bc = new ByteChunk();
Map> reqHeaders = new HashMap<>();
reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" +
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" +
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
test/javax/el/TestArrayELResolver.java | 2 +-
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 6 ++--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../util/TestContextNameExtractFromPath.java | 2 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
15 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/test/javax/el/TestArrayELResolver.java
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
@Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
// Should always return null
ArrayELResolver resolver = new ArrayELResolver();
Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends
[tomcat] branch 8.5.x updated (d89b6b2 -> a990db1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d89b6b2 Fix spelling in coyote, el, jasper and naming new 1b1cd61 Fix spellings in code forked from Commons new b6eb9ae Fix spellings in unit tests new ae377a3 Fix spellings in docs new 4673dca Fix spellings new d62277e Fix spellings in o.a.tomcat new b9c4105 Fix spellings in modules new 53ecac9 Fix one spelling missed on first pass new a990db1 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 4 +-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 62 files changed, 129 insertions(+), 129 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e73574246320569773ee884b2ee0184b2bf16564
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 3845a17..1b864ae 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1562,7 +1562,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b9c41057a7d747ce5428809401cd6d94867b0e6f Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 59c979d..d96e287 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -912,7 +912,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit bc2a9051da815fdb119e49b042b31f320aeb329c Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 2042544..c62e9ac 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1078,7 +1078,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b1cd6181aa27c0bfc9054a484889050060b7d31
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 70a052a..dcb5c9c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -466,7 +466,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e23d382a023f145dca38c637f61ee2c70c799ca
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/json/JSONParser.jj | 2 +-
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
17 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index 6652381..d05cc8b 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -449,7 +449,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index 8e0812c..11122fa 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends JreCompat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 8275e60..099ee87 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ae377a330342f7007e89041e73f3cd6eb9e13ca8 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index a0b0c8e..f443a11 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -262,7 +262,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 873ff75..37802d4 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -275,7 +275,7 @@ Tomcat normalises sequences of multiple / characters in -a URI to a single /. This is for consistencuy with the +a URI to a single /. This is for consistency with the behaviour of file systems as URIs are often translated to file system paths. As a result, the return value of HttpServletRequest#getContextPath() is expected to start diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml index e9e26ef..35b533e 100644 ---
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 4673dca22fe3ad1b681e479f1cba394f6154dc80 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index ba2e9a2..77327a1 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1077,7 +1077,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (d89b6b2 -> a990db1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d89b6b2 Fix spelling in coyote, el, jasper and naming new 1b1cd61 Fix spellings in code forked from Commons new b6eb9ae Fix spellings in unit tests new ae377a3 Fix spellings in docs new 4673dca Fix spellings new d62277e Fix spellings in o.a.tomcat new b9c4105 Fix spellings in modules new 53ecac9 Fix one spelling missed on first pass new a990db1 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 4 +-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 62 files changed, 129 insertions(+), 129 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3b1f523ced4d00f83b1a3b865f78557b86bfad93
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 31faa61..3845a17 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -455,7 +455,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 44784a731efa6ae7cb96491498f6bea6679d033d Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 852b83b..b1ed993 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -917,7 +917,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e73574246320569773ee884b2ee0184b2bf16564
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 3845a17..1b864ae 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1562,7 +1562,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (ac3a90c -> 377bc85)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ac3a90c Fix spelling in coyote, el, jasper and naming new 3b1f523 Fix spellings in code forked from Commons new f899221 Fix spellings in unit tests new e146e75 Fix spellings in docs new bc2a905 Fix spellings new 4e23d38 Fix spellings in o.a.tomcat new 44784a7 Fix spellings in modules new e735742 Fix one spelling missed on first pass new 377bc85 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- java/org/apache/tomcat/util/json/JSONParser.jj | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- test/javax/el/TestArrayELResolver.java | 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 6 ++-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../util/TestContextNameExtractFromPath.java | 2 +- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cdi.xml | 2 +- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 67 files changed, 135 insertions(+), 135 deletions(-)
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
test/javax/el/TestArrayELResolver.java | 2 +-
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 6 ++--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../util/TestContextNameExtractFromPath.java | 2 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
15 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/test/javax/el/TestArrayELResolver.java
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
@Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
// Should always return null
ArrayELResolver resolver = new ArrayELResolver();
Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e146e75e09bac129dc8d2f7a296e647f188e05a0 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cdi.xml | 2 +- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml index e9cea2c..5ffa564 100644 --- a/webapps/docs/cdi.xml +++ b/webapps/docs/cdi.xml @@ -68,7 +68,7 @@ mvn clean && mvn package]]> The listener will produce a non fatal error if the CDI container loading fails. CDI support can also be enabled at the individual webapp level by adding -the following listner to the webapp context.xml file nested +the following listener to the webapp context.xml file nested inside the Server element: diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index eecbc01..9d78dbf 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -263,7 +263,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 696cbc4..e1ddd20 100644 ---
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit bc2a9051da815fdb119e49b042b31f320aeb329c Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 2042544..c62e9ac 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1078,7 +1078,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3b1f523ced4d00f83b1a3b865f78557b86bfad93
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 31faa61..3845a17 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -455,7 +455,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b1cd6181aa27c0bfc9054a484889050060b7d31
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 70a052a..dcb5c9c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -466,7 +466,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
test/javax/el/TestArrayELResolver.java | 2 +-
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 6 ++--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../util/TestContextNameExtractFromPath.java | 2 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
15 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/test/javax/el/TestArrayELResolver.java
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
@Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
// Should always return null
ArrayELResolver resolver = new ArrayELResolver();
Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e73574246320569773ee884b2ee0184b2bf16564
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 3845a17..1b864ae 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1562,7 +1562,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 53ecac96b140b8c2b3fd655593b05cac3c64f19e
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index dcb5c9c..eff3e16 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1579,7 +1579,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b9c41057a7d747ce5428809401cd6d94867b0e6f Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 59c979d..d96e287 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -912,7 +912,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 4673dca22fe3ad1b681e479f1cba394f6154dc80 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index ba2e9a2..77327a1 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1077,7 +1077,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d62277e40e3936d87179f8bcced136f4db53d58c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index d3ec97c..3ba68af 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -423,7 +423,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index f551ca6..0f66453 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends Jre8Compat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 5cb26d2..e61dd03 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -232,7 +232,7 @@ public class JreCompat {
* @return {code
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ae377a330342f7007e89041e73f3cd6eb9e13ca8 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index a0b0c8e..f443a11 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -262,7 +262,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 873ff75..37802d4 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -275,7 +275,7 @@ Tomcat normalises sequences of multiple / characters in -a URI to a single /. This is for consistencuy with the +a URI to a single /. This is for consistency with the behaviour of file systems as URIs are often translated to file system paths. As a result, the return value of HttpServletRequest#getContextPath() is expected to start diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml index e9e26ef..35b533e 100644 ---
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e23d382a023f145dca38c637f61ee2c70c799ca
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/json/JSONParser.jj | 2 +-
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
17 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index 6652381..d05cc8b 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -449,7 +449,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index 8e0812c..11122fa 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends JreCompat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 8275e60..099ee87 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
[tomcat] branch 9.0.x updated (ac3a90c -> 377bc85)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ac3a90c Fix spelling in coyote, el, jasper and naming new 3b1f523 Fix spellings in code forked from Commons new f899221 Fix spellings in unit tests new e146e75 Fix spellings in docs new bc2a905 Fix spellings new 4e23d38 Fix spellings in o.a.tomcat new 44784a7 Fix spellings in modules new e735742 Fix one spelling missed on first pass new 377bc85 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- java/org/apache/tomcat/util/json/JSONParser.jj | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- test/javax/el/TestArrayELResolver.java | 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 6 ++-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../util/TestContextNameExtractFromPath.java | 2 +- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cdi.xml | 2 +- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 67 files changed, 135 insertions(+), 135 deletions(-)
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 4 +--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
13 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
}
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean
expect200)
throws Exception {
// Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
ByteChunk bc = new ByteChunk();
Map> reqHeaders = new HashMap<>();
reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" +
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" +
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 44784a731efa6ae7cb96491498f6bea6679d033d Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 852b83b..b1ed993 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -917,7 +917,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit bc2a9051da815fdb119e49b042b31f320aeb329c Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 2042544..c62e9ac 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1078,7 +1078,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (d89b6b2 -> a990db1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d89b6b2 Fix spelling in coyote, el, jasper and naming new 1b1cd61 Fix spellings in code forked from Commons new b6eb9ae Fix spellings in unit tests new ae377a3 Fix spellings in docs new 4673dca Fix spellings new d62277e Fix spellings in o.a.tomcat new b9c4105 Fix spellings in modules new 53ecac9 Fix one spelling missed on first pass new a990db1 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 4 +-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 62 files changed, 129 insertions(+), 129 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e146e75e09bac129dc8d2f7a296e647f188e05a0 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cdi.xml | 2 +- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml index e9cea2c..5ffa564 100644 --- a/webapps/docs/cdi.xml +++ b/webapps/docs/cdi.xml @@ -68,7 +68,7 @@ mvn clean && mvn package]]> The listener will produce a non fatal error if the CDI container loading fails. CDI support can also be enabled at the individual webapp level by adding -the following listner to the webapp context.xml file nested +the following listener to the webapp context.xml file nested inside the Server element: diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index eecbc01..9d78dbf 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -263,7 +263,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 696cbc4..e1ddd20 100644 ---
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 4 +--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
13 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
}
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean
expect200)
throws Exception {
// Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
ByteChunk bc = new ByteChunk();
Map> reqHeaders = new HashMap<>();
reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" +
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" +
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a990db168d4080f6fe965355048f6540bccaa31b
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index f446a6b..6e692ef 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -78,7 +78,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -114,7 +114,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -270,10 +270,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -297,15 +297,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -772,7 +772,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -865,7 +865,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1069,7 +1069,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1231,7 +1231,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1390,7 +1390,7 @@ public class
[tomcat] 08/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 377bc8522c31135764acbf38b9fc6b308edd6ec3
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:16:05 2020 +0100
Fix spellings
Based on a PR provided by John Bampton
Only those that don;t affect the public API
---
.../apache/catalina/ha/session/DeltaManager.java | 26 +++---
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties| 6 ++---
.../catalina/ha/session/LocalStrings_es.properties | 4 ++--
.../catalina/ha/session/LocalStrings_fr.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ja.properties | 4 ++--
.../catalina/ha/session/LocalStrings_ko.properties | 4 ++--
.../ha/session/LocalStrings_zh_CN.properties | 4 ++--
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 92fdd09..7f39989 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
private boolean expireSessionsOnShutdown = false;
private boolean notifySessionListenersOnReplication = true;
private boolean notifyContainerListenersOnReplication = true;
-private volatile boolean stateTransfered = false ;
+private volatile boolean stateTransferred = false ;
private volatile boolean noContextManagerReceived = false ;
private int stateTransferTimeout = 60;
private boolean sendAllSessions = true;
@@ -109,7 +109,7 @@ public class DeltaManager extends ClusterManagerBase{
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
private long counterSend_EVT_CHANGE_SESSION_ID = 0;
-private int counterNoStateTransfered = 0 ;
+private int counterNoStateTransferred = 0 ;
// -
Constructor
@@ -265,10 +265,10 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * @return Returns the counterNoStateTransfered.
+ * @return Returns the counterNoStateTransferred.
*/
public int getCounterNoStateTransfered() {
-return counterNoStateTransfered;
+return counterNoStateTransferred;
}
public int getReceivedQueueSize() {
@@ -292,15 +292,15 @@ public class DeltaManager extends ClusterManagerBase{
* @return true if the state transfer is complete.
*/
public boolean getStateTransfered() {
-return stateTransfered;
+return stateTransferred;
}
/**
* Set that state transferred is complete
- * @param stateTransfered Flag value
+ * @param stateTransferred Flag value
*/
-public void setStateTransfered(boolean stateTransfered) {
-this.stateTransfered = stateTransfered;
+public void setStateTransfered(boolean stateTransferred) {
+this.stateTransferred = stateTransferred;
}
public boolean isNoContextManagerReceived() {
@@ -773,7 +773,7 @@ public class DeltaManager extends ClusterManagerBase{
stateTransferCreateSendTime = beforeSendTime ;
// request session state
counterSend_EVT_GET_ALL_SESSIONS++;
-stateTransfered = false ;
+stateTransferred = false ;
// FIXME This send call block the deploy thread, when sender
waitForAck is enabled
try {
synchronized(receivedMessageQueue) {
@@ -866,7 +866,7 @@ public class DeltaManager extends ClusterManagerBase{
}
}
if (isTimeout) {
-counterNoStateTransfered++ ;
+counterNoStateTransferred++ ;
log.error(sm.getString("deltaManager.noSessionState", getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}else if (isNoContextManagerReceived()) {
@@ -1070,7 +1070,7 @@ public class DeltaManager extends ClusterManagerBase{
}
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
-counterNoStateTransfered = 0 ;
+counterNoStateTransferred = 0 ;
setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
@@ -1232,7 +1232,7 @@ public class DeltaManager extends ClusterManagerBase{
getName(), sender.getHost(),
Integer.valueOf(sender.getPort(;
}
stateTransferCreateSendTime = msg.getTimestamp() ;
-stateTransfered = true ;
+stateTransferred = true ;
}
/**
@@ -1391,7 +1391,7 @@ public class
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3b1f523ced4d00f83b1a3b865f78557b86bfad93
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 31faa61..3845a17 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -455,7 +455,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 4673dca22fe3ad1b681e479f1cba394f6154dc80 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index ba2e9a2..77327a1 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1077,7 +1077,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d62277e40e3936d87179f8bcced136f4db53d58c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index d3ec97c..3ba68af 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -423,7 +423,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index f551ca6..0f66453 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends Jre8Compat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 5cb26d2..e61dd03 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -232,7 +232,7 @@ public class JreCompat {
* @return {code
[tomcat] branch 8.5.x updated (d89b6b2 -> a990db1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d89b6b2 Fix spelling in coyote, el, jasper and naming new 1b1cd61 Fix spellings in code forked from Commons new b6eb9ae Fix spellings in unit tests new ae377a3 Fix spellings in docs new 4673dca Fix spellings new d62277e Fix spellings in o.a.tomcat new b9c4105 Fix spellings in modules new 53ecac9 Fix one spelling missed on first pass new a990db1 Fix spellings The 8 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: .../apache/catalina/ha/session/DeltaManager.java | 26 .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties| 6 ++-- .../catalina/ha/session/LocalStrings_es.properties | 4 +-- .../catalina/ha/session/LocalStrings_fr.properties | 4 +-- .../catalina/ha/session/LocalStrings_ja.properties | 4 +-- .../catalina/ha/session/LocalStrings_ko.properties | 4 +-- .../ha/session/LocalStrings_zh_CN.properties | 4 +-- .../catalina/ha/session/mbeans-descriptors.xml | 2 +- .../buildutil/translate/BackportTranslations.java | 12 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-- .../pool2/impl/DefaultPooledObjectInfoMBean.java | 4 +-- .../tomcat/util/bcel/classfile/ConstantPool.java | 2 +- .../tomcat/util/bcel/classfile/JavaClass.java | 2 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +- java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 2 +- .../apache/tomcat/util/digester/ArrayStack.java| 2 +- .../util/digester/ObjectCreationFactory.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 6 ++-- .../tomcat/util/http/fileupload/FileItem.java | 2 +- .../util/http/fileupload/FileItemIterator.java | 2 +- .../tomcat/util/modeler/modules/package.html | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- .../util/net/openssl/LocalStrings.properties | 2 +- .../util/net/openssl/LocalStrings_fr.properties| 2 +- .../util/net/openssl/LocalStrings_ja.properties| 2 +- .../util/net/openssl/LocalStrings_ko.properties| 2 +- .../util/net/openssl/LocalStrings_zh_CN.properties | 2 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../tomcat/util/net/openssl/OpenSSLUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 2 +- .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-- .../jdbc/pool/interceptor/StatementFinalizer.java | 2 +- res/findbugs/filter-false-positives.xml| 2 +- .../el/TestImportHandlerStandardPackages.java | 2 +- test/javax/servlet/http/TestHttpServlet.java | 2 +- .../jaspic/TestAuthConfigFactoryImpl.java | 8 ++--- .../org/apache/catalina/connector/TestRequest.java | 4 +-- .../apache/catalina/core/TestAsyncContextImpl.java | 2 +- .../catalina/startup/TestMultipartConfig.java | 2 +- .../catalina/startup/TestTomcatNoServer.java | 4 +-- .../apache/catalina/valves/TestRemoteIpValve.java | 6 ++-- test/org/apache/coyote/TestRequest.java| 16 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/juli/TestFileHandler.java | 36 +++--- test/org/apache/naming/TesterInjectionServlet.java | 2 +- .../websocket/pojo/TestEncodingDecoding.java | 6 ++-- webapps/docs/cgi-howto.xml | 4 +-- webapps/docs/class-loader-howto.xml| 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/context.xml| 2 +- webapps/docs/config/globalresources.xml| 2 +- webapps/docs/config/http.xml | 8 ++--- webapps/docs/config/http2.xml | 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml| 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 2 +- webapps/docs/ssi-howto.xml | 4 +-- webapps/docs/web-socket-howto.xml | 2 +- 62 files changed, 129 insertions(+), 129 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 53ecac96b140b8c2b3fd655593b05cac3c64f19e
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index dcb5c9c..eff3e16 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1579,7 +1579,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b9c41057a7d747ce5428809401cd6d94867b0e6f Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 59c979d..d96e287 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -912,7 +912,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 01/08: Fix spellings in code forked from Commons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b1cd6181aa27c0bfc9054a484889050060b7d31
Author: Mark Thomas
AuthorDate: Wed Sep 16 17:50:07 2020 +0100
Fix spellings in code forked from Commons
Based on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java| 2 +-
.../apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 70a052a..dcb5c9c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -466,7 +466,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*
* @return A new connection factory.
*
- * @throws SQLException If the connection factort cannot be created
+ * @throws SQLException If the connection factory cannot be created
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
diff --git
a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
index eac4a5c..f4540b6 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
@@ -57,7 +57,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last borrowed.
*
- * @return The last borrowed time for the pooled object formated as
+ * @return The last borrowed time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastBorrowTimeFormatted();
@@ -82,7 +82,7 @@ public interface DefaultPooledObjectInfoMBean {
/**
* Obtain the time that pooled object was last returned.
*
- * @return The last returned time for the pooled object formated as
+ * @return The last returned time for the pooled object formatted as
* {@code -MM-dd HH:mm:ss Z}
*/
String getLastReturnTimeFormatted();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index 0cc4ba7..f3ab072 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.bcel.Const;
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
* long) entry. Those interested in generating constant pools
- * programatically should see
+ * programmatically should see
* ConstantPoolGen.
* @see Constant
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index df1cd21..46473ad 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel.classfile;
* fields, methods and commands contained in a Java .class file.
* See https://docs.oracle.com/javase/specs/;>JVM specification
for details.
* The intent of this class is to represent a parsed or otherwise existing
- * class file. Those interested in programatically generating classes
+ * class file. Those interested in programmatically generating classes
* should see the ClassGen class.
*/
public class JavaClass {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index b7bdb55..29aa496 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -195,7 +195,7 @@ public interface FileItem extends FileItemHeadersSupport {
* be used for storing the contents of the file.
*
* @return An {@link java.io.OutputStream OutputStream} that can be used
- * for storing the contensts of the file.
+ * for storing the contents of the file.
*
* @throws IOException if an error occurs.
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
[tomcat] 03/08: Fix spellings in docs
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ae377a330342f7007e89041e73f3cd6eb9e13ca8 Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:06 2020 +0100 Fix spellings in docs Based on a PR provided by John Bampton --- webapps/docs/cgi-howto.xml | 4 ++-- webapps/docs/class-loader-howto.xml | 2 +- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/cluster-valve.xml| 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 8 webapps/docs/config/http2.xml| 2 +- webapps/docs/default-servlet.xml | 2 +- webapps/docs/host-manager-howto.xml | 2 +- webapps/docs/html-host-manager-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml| 2 +- webapps/docs/ssi-howto.xml | 4 ++-- webapps/docs/web-socket-howto.xml| 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml index 09241ab..e00faf0 100644 --- a/webapps/docs/cgi-howto.xml +++ b/webapps/docs/cgi-howto.xml @@ -102,7 +102,7 @@ the web application root directory + File.separator + this prefix. By default there is no value, which results in the web application root directory being used as the search path. The recommended value is WEB-INF/cgi -cmdLineArgumentsDecoded - If command line argumemnts +cmdLineArgumentsDecoded - If command line arguments are enabled (via enableCmdLineArguments) and Tomcat is running on Windows then each individual decoded command line argument must match this pattern else the request will be rejected. This is to protect against known @@ -112,7 +112,7 @@ lead to remote code execution. For more information on these issues see Wulftanges blog and this archived https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/;>blog by Daniel Colascione. -cmdLineArgumentsEncoded - If command line argumemnts +cmdLineArgumentsEncoded - If command line arguments are enabled (via enableCmdLineArguments) individual encoded command line argument must match this pattern else the request will be rejected. The default matches the allowed values defined by RFC3875 and is diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index a0b0c8e..f443a11 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -262,7 +262,7 @@ for further information. A more complex class loader hierarchy may also be configured. See the diagram below. By default, the Server and Shared -class loaders are not defined and the simplifed hierarchy shown above is used. +class loaders are not defined and the simplified hierarchy shown above is used. This more complex hierarchy may be use by defining values for the server.loader and/or shared.loader properties in conf/catalina.properties. diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 09cdb2c..cb1f33f 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -258,7 +258,7 @@ should be completed: Hint: With attribute sessionIdAttribute you can change the request attribute name that included the old session id. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. Trick: diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml index d930ae2..7722bd7 100644 --- a/webapps/docs/config/cluster-valve.xml +++ b/webapps/docs/config/cluster-valve.xml @@ -98,7 +98,7 @@ Old sessionid before failover is registered in request attributes with this attribute. -Default attribute name is org.apache.catalina.ha.session.JvmRouteOrignalSessionID. +Default attribute name is org.apache.catalina.ha.session.JvmRouteOriginalSessionID. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 873ff75..37802d4 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -275,7 +275,7 @@ Tomcat normalises sequences of multiple / characters in -a URI to a single /. This is for consistencuy with the +a URI to a single /. This is for consistency with the behaviour of file systems as URIs are often translated to file system paths. As a result, the return value of HttpServletRequest#getContextPath() is expected to start diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml index e9e26ef..35b533e 100644 ---
[tomcat] 05/08: Fix spellings in o.a.tomcat
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e23d382a023f145dca38c637f61ee2c70c799ca
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:04:39 2020 +0100
Fix spellings in o.a.tomcat
---
.../tomcat/buildutil/translate/BackportTranslations.java | 12 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java| 2 +-
java/org/apache/tomcat/util/digester/ArrayStack.java | 2 +-
.../apache/tomcat/util/digester/ObjectCreationFactory.java | 2 +-
java/org/apache/tomcat/util/digester/package.html| 6 +++---
java/org/apache/tomcat/util/json/JSONParser.jj | 2 +-
java/org/apache/tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
.../apache/tomcat/util/net/openssl/LocalStrings.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_fr.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ja.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_ko.properties | 2 +-
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java | 2 +-
java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java | 2 +-
17 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 25c2d75..1da15de 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -41,17 +41,17 @@ public class BackportTranslations extends BackportBase {
@Override
protected void execute() throws IOException {
-for (String langauge : targetTranslations.keySet()) {
+for (String language : targetTranslations.keySet()) {
// Skip source
-if (langauge.length() == 0) {
+if (language.length() == 0) {
continue;
}
-Properties sourceTranslated = sourceTranslations.get(langauge);
-Properties targetTranslated = targetTranslations.get(langauge);
+Properties sourceTranslated = sourceTranslations.get(language);
+Properties targetTranslated = targetTranslations.get(language);
if (targetTranslated == null) {
targetTranslated = new Properties();
-targetTranslations.put(langauge, targetTranslated);
+targetTranslations.put(language, targetTranslated);
}
for (Object key : targetEnglish.keySet()) {
@@ -70,7 +70,7 @@ public class BackportTranslations extends BackportBase {
iter.remove();
}
}
-Utils.export(langauge, targetTranslated, storageDir);
+Utils.export(language, targetTranslated, storageDir);
}
}
}
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index 6652381..d05cc8b 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -449,7 +449,7 @@ public final class ByteChunk extends AbstractChunk {
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by the
- * number of the transfered bytes.
+ * number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index 8e0812c..11122fa 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -224,7 +224,7 @@ class Jre9Compat extends JreCompat {
@Override
-public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 8275e60..099ee87 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
[tomcat] 06/08: Fix spellings in modules
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 44784a731efa6ae7cb96491498f6bea6679d033d Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:48 2020 +0100 Fix spellings in modules Based on a PR provided by John Bampton --- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml index 852b83b..b1ed993 100644 --- a/modules/jdbc-pool/doc/jdbc-pool.xml +++ b/modules/jdbc-pool/doc/jdbc-pool.xml @@ -917,7 +917,7 @@ a string value comparison when the useEquals=true flag is set. Pool start/stop - When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + When the connection pool is started or closed, you can be notified. You will only be notified once per interceptor class even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
[tomcat] 04/08: Fix spellings
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit bc2a9051da815fdb119e49b042b31f320aeb329c Author: Mark Thomas AuthorDate: Wed Sep 16 18:04:20 2020 +0100 Fix spellings Based on a PR provided by John Bampton --- res/findbugs/filter-false-positives.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 2042544..c62e9ac 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -1078,7 +1078,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/08: Fix one spelling missed on first pass
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e73574246320569773ee884b2ee0184b2bf16564
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:15:11 2020 +0100
Fix one spelling missed on first pass
ased on a PR provided by John Bampton
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 3845a17..1b864ae 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -1562,7 +1562,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Restarts the datasource.
*
* This method calls {@link #close()} and {@link #start()} in sequence
within synchronized scope so any
- * connection requests that come in while the datsource is shutting down
will be served by the new pool.
+ * connection requests that come in while the datasource is shutting down
will be served by the new pool.
*
* Idle connections that are stored in the connection pool when this
method is invoked are closed, but
* connections that are checked out to clients when this method is invoked
are not affected. When client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/08: Fix spellings in unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas
AuthorDate: Wed Sep 16 18:03:51 2020 +0100
Fix spellings in unit tests
Based on a PR provided by John Bampton
---
test/javax/el/TestArrayELResolver.java | 2 +-
.../el/TestImportHandlerStandardPackages.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 2 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 8 ++---
.../org/apache/catalina/connector/TestRequest.java | 6 ++--
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/startup/TestMultipartConfig.java | 2 +-
.../catalina/startup/TestTomcatNoServer.java | 4 +--
.../util/TestContextNameExtractFromPath.java | 2 +-
.../apache/catalina/valves/TestRemoteIpValve.java | 6 ++--
test/org/apache/coyote/TestRequest.java| 16 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +-
test/org/apache/juli/TestFileHandler.java | 36 +++---
test/org/apache/naming/TesterInjectionServlet.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 6 ++--
15 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/test/javax/el/TestArrayELResolver.java
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
@Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
// Should always return null
ArrayELResolver resolver = new ArrayELResolver();
Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
Assert.assertNotNull(files);
for (String file : files) {
if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
continue;
}
if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
* this test. It was placed in that package because it needed access to
* package private classes.
*/
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
@Test
public void testRegistrationNullLayer() {
-doTestResistration(null, "AC_1", ":AC_1");
+doTestRegistration(null, "AC_1", ":AC_1");
}
@Test
public void testRegistrationNullAppContext() {
-doTestResistration("L_1", null, "L_1:");
+doTestRegistration("L_1", null, "L_1:");
}
@Test
public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null, null, ":");
+doTestRegistration(null, null, ":");
}
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
}
-private void doTestResistration(String layer, String appContext, String
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String
expectedRegId) {
AuthConfigFactory factory = new AuthConfigFactoryImpl();
AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
SimpleRegistrationListener listener = new
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends
