[GitHub] [tomcat] carterkozak opened a new pull request #204: Fix typo in StringManager class javadoc
carterkozak opened a new pull request #204: Fix typo in StringManager class javadoc URL: https://github.com/apache/tomcat/pull/204 s/formating/formatting 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4596 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 2050f1a04ad6254df492049c14bd12f39ab1120e Blamelist: Bill Mitchell ,Mark Thomas ,xiantang <986494...@qq.com> 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
[tomcat] 01/02: spelling and formatting corrections for cluster-howto
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 45958d01215f359638a2a3d6c4d133bafc126bb9 Author: Bill Mitchell AuthorDate: Tue Sep 10 16:59:18 2019 -0400 spelling and formatting corrections for cluster-howto --- webapps/docs/cluster-howto.xml | 51 +- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 456ea58..02cd9c2 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -478,13 +478,13 @@ should be completed: -To make it easy to understand how clustering works, We are gonna take you through a series of scenarios. - In the scenario we only plan to use two tomcat instances TomcatA and TomcatB. +To make it easy to understand how clustering works, we are gonna to take you through a series of scenarios. + In this scenario we only plan to use two tomcat instances TomcatA and TomcatB. We will cover the following sequence of events: TomcatA starts up -TomcatB starts up (Wait that TomcatA start is complete) +TomcatB starts up (Wait the TomcatA start is complete) TomcatA receives a request, a session S1 is created. TomcatA crashes TomcatB receives a request for session S1 @@ -500,7 +500,7 @@ should be completed: TomcatA starts up Tomcat starts up using the standard start up sequence. When the Host object is created, a cluster object is associated with it. -When the contexts are parsed, if the distributable element is in place in web.xml +When the contexts are parsed, if the distributable element is in place in the web.xml file, Tomcat asks the Cluster class (in this case SimpleTcpCluster) to create a manager for the replicated context. So with clustering enabled, distributable set in web.xml Tomcat will create a DeltaManager for that context instead of a StandardManager. @@ -511,38 +511,37 @@ should be completed: TomcatB starts up When TomcatB starts up, it follows the same sequence as TomcatA did with one exception. -The cluster is started and will establish a membership (TomcatA,TomcatB). +The cluster is started and will establish a membership (TomcatA, TomcatB). TomcatB will now request the session state from a server that already exists in the cluster, in this case TomcatA. TomcatA responds to the request, and before TomcatB starts listening for HTTP requests, the state has been transferred from TomcatA to TomcatB. -In case TomcatA doesn't respond, TomcatB will time out after 60 seconds, and issue a log -entry. The session state gets transferred for each web application that has distributable in -its web.xml. Note: To use session replication efficiently, all your tomcat instances should be -configured the same. +In case TomcatA doesn't respond, TomcatB will time out after 60 seconds, issue a log +entry, and continue starting. The session state gets transferred for each web +application that has distributable in its web.xml. (Note: To use session replication +efficiently, all your tomcat instances should be configured the same.) TomcatA receives a request, a session S1 is created. -The request coming in to TomcatA is treated exactly the same way as without session replication. -The action happens when the request is completed, the ReplicationValve will intercept -the request before the response is returned to the user. -At this point it finds that the session has been modified, and it uses TCP to replicate the -session to TomcatB. Once the serialized data has been handed off to the operating systems TCP logic, -the request returns to the user, back through the valve pipeline. -For each request the entire session is replicated, this allows code that modifies attributes -in the session without calling setAttribute or removeAttribute to be replicated. -a useDirtyFlag configuration parameter can be used to optimize the number of times -a session is replicated. +The request coming in to TomcatA is handled exactly the same way as without session +replication, until the request is completed, at which time the +ReplicationValve will intercept the request before the response is +returned to the user. At this point it finds that the session has been modified, +and it uses TCP to replicate the session to TomcatB. Once the serialized data has +been handed off to the operating system's TCP logic, the request returns to the user, +back through the valve pipeline. For each request the entire session is replicated, +this allows code that
[tomcat] 02/02: Changelog entry for previous commit.
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 5764f066ed754fa3c135610a47bdcff2d60c4a0d Author: Mark Thomas AuthorDate: Wed Sep 11 18:36:34 2019 +0100 Changelog entry for previous commit. --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6d8c54a..0a75e46 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -142,6 +142,10 @@ Fix a large number of Javadoc and documentation typos. Patch provided by KangZhiDong. (markt) + +Spelling and formatting corrections for the cluster how-to. Pull request +provided by Bill Mitchell. (markt) + - 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 (0cb2ba2 -> 5764f06)
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 0cb2ba2 Polish. Add spaces new 45958d0 spelling and formatting corrections for cluster-howto new 5764f06 Changelog entry for previous commit. 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: webapps/docs/changelog.xml | 4 webapps/docs/cluster-howto.xml | 51 +- 2 files changed, 29 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: spelling and formatting corrections for cluster-howto
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 ac1121e4b5cace1de3976accfa0f472584ec Author: Bill Mitchell AuthorDate: Tue Sep 10 16:59:18 2019 -0400 spelling and formatting corrections for cluster-howto --- webapps/docs/cluster-howto.xml | 51 +- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index d05f708..736b290 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -481,13 +481,13 @@ should be completed: -To make it easy to understand how clustering works, We are gonna take you through a series of scenarios. - In the scenario we only plan to use two tomcat instances TomcatA and TomcatB. +To make it easy to understand how clustering works, we are gonna to take you through a series of scenarios. + In this scenario we only plan to use two tomcat instances TomcatA and TomcatB. We will cover the following sequence of events: TomcatA starts up -TomcatB starts up (Wait that TomcatA start is complete) +TomcatB starts up (Wait the TomcatA start is complete) TomcatA receives a request, a session S1 is created. TomcatA crashes TomcatB receives a request for session S1 @@ -503,7 +503,7 @@ should be completed: TomcatA starts up Tomcat starts up using the standard start up sequence. When the Host object is created, a cluster object is associated with it. -When the contexts are parsed, if the distributable element is in place in web.xml +When the contexts are parsed, if the distributable element is in place in the web.xml file, Tomcat asks the Cluster class (in this case SimpleTcpCluster) to create a manager for the replicated context. So with clustering enabled, distributable set in web.xml Tomcat will create a DeltaManager for that context instead of a StandardManager. @@ -514,38 +514,37 @@ should be completed: TomcatB starts up When TomcatB starts up, it follows the same sequence as TomcatA did with one exception. -The cluster is started and will establish a membership (TomcatA,TomcatB). +The cluster is started and will establish a membership (TomcatA, TomcatB). TomcatB will now request the session state from a server that already exists in the cluster, in this case TomcatA. TomcatA responds to the request, and before TomcatB starts listening for HTTP requests, the state has been transferred from TomcatA to TomcatB. -In case TomcatA doesn't respond, TomcatB will time out after 60 seconds, and issue a log -entry. The session state gets transferred for each web application that has distributable in -its web.xml. Note: To use session replication efficiently, all your tomcat instances should be -configured the same. +In case TomcatA doesn't respond, TomcatB will time out after 60 seconds, issue a log +entry, and continue starting. The session state gets transferred for each web +application that has distributable in its web.xml. (Note: To use session replication +efficiently, all your tomcat instances should be configured the same.) TomcatA receives a request, a session S1 is created. -The request coming in to TomcatA is treated exactly the same way as without session replication. -The action happens when the request is completed, the ReplicationValve will intercept -the request before the response is returned to the user. -At this point it finds that the session has been modified, and it uses TCP to replicate the -session to TomcatB. Once the serialized data has been handed off to the operating systems TCP logic, -the request returns to the user, back through the valve pipeline. -For each request the entire session is replicated, this allows code that modifies attributes -in the session without calling setAttribute or removeAttribute to be replicated. -a useDirtyFlag configuration parameter can be used to optimize the number of times -a session is replicated. +The request coming in to TomcatA is handled exactly the same way as without session +replication, until the request is completed, at which time the +ReplicationValve will intercept the request before the response is +returned to the user. At this point it finds that the session has been modified, +and it uses TCP to replicate the session to TomcatB. Once the serialized data has +been handed off to the operating system's TCP logic, the request returns to the user, +back through the valve pipeline. For each request the entire session is replicated, +this allows code that
[tomcat] 02/02: Changelog entry for previous commit.
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 2338d6d293a48a6a59211a23d771297360753ce0 Author: Mark Thomas AuthorDate: Wed Sep 11 18:36:34 2019 +0100 Changelog entry for previous commit. --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 46de0ac..4ac22f9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,6 +104,10 @@ Fix a large number of Javadoc and documentation typos. Patch provided by KangZhiDong. (markt) + +Spelling and formatting corrections for the cluster how-to. Pull request +provided by Bill Mitchell. (markt) + - 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 (37b19e3 -> 2338d6d)
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 37b19e3 Polish. Add spaces new ac1121e spelling and formatting corrections for cluster-howto new 2338d6d Changelog entry for previous commit. 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: webapps/docs/changelog.xml | 4 webapps/docs/cluster-howto.xml | 51 +- 2 files changed, 29 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Changelog entry for previous commit.
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 2050f1a Changelog entry for previous commit. 2050f1a is described below commit 2050f1a04ad6254df492049c14bd12f39ab1120e Author: Mark Thomas AuthorDate: Wed Sep 11 18:36:34 2019 +0100 Changelog entry for previous commit. --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3b19889..cb4ea48 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -131,6 +131,10 @@ Fix a large number of Javadoc and documentation typos. Patch provided by KangZhiDong. (markt) + +Spelling and formatting corrections for the cluster how-to. Pull request +provided by Bill Mitchell. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: spelling and formatting corrections for cluster-howto
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 66be9c2 spelling and formatting corrections for cluster-howto 66be9c2 is described below commit 66be9c20b9295a41d799448b4e2a2160dabebb60 Author: Bill Mitchell AuthorDate: Tue Sep 10 16:59:18 2019 -0400 spelling and formatting corrections for cluster-howto --- webapps/docs/cluster-howto.xml | 51 +- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index 0e2dde2..7bbea3b 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -493,13 +493,13 @@ should be completed: -To make it easy to understand how clustering works, We are gonna take you through a series of scenarios. - In the scenario we only plan to use two tomcat instances TomcatA and TomcatB. +To make it easy to understand how clustering works, we are gonna to take you through a series of scenarios. + In this scenario we only plan to use two tomcat instances TomcatA and TomcatB. We will cover the following sequence of events: TomcatA starts up -TomcatB starts up (Wait that TomcatA start is complete) +TomcatB starts up (Wait the TomcatA start is complete) TomcatA receives a request, a session S1 is created. TomcatA crashes TomcatB receives a request for session S1 @@ -515,7 +515,7 @@ should be completed: TomcatA starts up Tomcat starts up using the standard start up sequence. When the Host object is created, a cluster object is associated with it. -When the contexts are parsed, if the distributable element is in place in web.xml +When the contexts are parsed, if the distributable element is in place in the web.xml file, Tomcat asks the Cluster class (in this case SimpleTcpCluster) to create a manager for the replicated context. So with clustering enabled, distributable set in web.xml Tomcat will create a DeltaManager for that context instead of a StandardManager. @@ -526,38 +526,37 @@ should be completed: TomcatB starts up When TomcatB starts up, it follows the same sequence as TomcatA did with one exception. -The cluster is started and will establish a membership (TomcatA,TomcatB). +The cluster is started and will establish a membership (TomcatA, TomcatB). TomcatB will now request the session state from a server that already exists in the cluster, in this case TomcatA. TomcatA responds to the request, and before TomcatB starts listening for HTTP requests, the state has been transferred from TomcatA to TomcatB. -In case TomcatA doesn't respond, TomcatB will time out after 60 seconds, and issue a log -entry. The session state gets transferred for each web application that has distributable in -its web.xml. Note: To use session replication efficiently, all your tomcat instances should be -configured the same. +In case TomcatA doesn't respond, TomcatB will time out after 60 seconds, issue a log +entry, and continue starting. The session state gets transferred for each web +application that has distributable in its web.xml. (Note: To use session replication +efficiently, all your tomcat instances should be configured the same.) TomcatA receives a request, a session S1 is created. -The request coming in to TomcatA is treated exactly the same way as without session replication. -The action happens when the request is completed, the ReplicationValve will intercept -the request before the response is returned to the user. -At this point it finds that the session has been modified, and it uses TCP to replicate the -session to TomcatB. Once the serialized data has been handed off to the operating systems TCP logic, -the request returns to the user, back through the valve pipeline. -For each request the entire session is replicated, this allows code that modifies attributes -in the session without calling setAttribute or removeAttribute to be replicated. -a useDirtyFlag configuration parameter can be used to optimize the number of times -a session is replicated. +The request coming in to TomcatA is handled exactly the same way as without session +replication, until the request is completed, at which time the +ReplicationValve will intercept the request before the response is +returned to the user. At this point it finds that the session has been modified, +and it uses TCP to replicate the session to TomcatB. Once the serialized data has +been handed off to the operating system's TCP
[GitHub] [tomcat] markt-asf merged pull request #203: spelling and formatting corrections for cluster-howto
markt-asf merged pull request #203: spelling and formatting corrections for cluster-howto URL: https://github.com/apache/tomcat/pull/203 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 With regards, Apache Git Services - 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: Polish. Add spaces
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 0cb2ba2 Polish. Add spaces
0cb2ba2 is described below
commit 0cb2ba222cd38d1bd4005aee68fc1a7a7c834046
Author: xiantang <986494...@qq.com>
AuthorDate: Tue Sep 10 15:03:26 2019 +0800
Polish. Add spaces
---
java/org/apache/tomcat/util/threads/LimitLatch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/threads/LimitLatch.java
b/java/org/apache/tomcat/util/threads/LimitLatch.java
index 8293c4e..6ef2e64 100644
--- a/java/org/apache/tomcat/util/threads/LimitLatch.java
+++ b/java/org/apache/tomcat/util/threads/LimitLatch.java
@@ -124,7 +124,7 @@ public class LimitLatch {
long result = getCount();
if (log.isDebugEnabled()) {
log.debug("Counting down["+Thread.currentThread().getName()+"]
latch="+result);
-}
+}
return result;
}
-
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: Polish. Add spaces
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 37b19e3 Polish. Add spaces
37b19e3 is described below
commit 37b19e34f3984bd3849a380562fd3ab74d437df2
Author: xiantang <986494...@qq.com>
AuthorDate: Tue Sep 10 15:03:26 2019 +0800
Polish. Add spaces
---
java/org/apache/tomcat/util/threads/LimitLatch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/threads/LimitLatch.java
b/java/org/apache/tomcat/util/threads/LimitLatch.java
index e868405..840ec55 100644
--- a/java/org/apache/tomcat/util/threads/LimitLatch.java
+++ b/java/org/apache/tomcat/util/threads/LimitLatch.java
@@ -126,7 +126,7 @@ public class LimitLatch {
long result = getCount();
if (log.isDebugEnabled()) {
log.debug("Counting down["+Thread.currentThread().getName()+"]
latch="+result);
-}
+}
return result;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #202: Polish. Add spaces
markt-asf merged pull request #202: Polish. Add spaces URL: https://github.com/apache/tomcat/pull/202 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 With regards, Apache Git Services - 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 issue #202: Polish. Add spaces
markt-asf commented on issue #202: Polish. Add spaces URL: https://github.com/apache/tomcat/pull/202#issuecomment-530480113 Tx. Applying now... 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Polish. Add spaces
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 46591e4 Polish. Add spaces
new ca429e4 Merge pull request #202 from xiantang/master
46591e4 is described below
commit 46591e418ee0f4155aedb45b3be3670600415de6
Author: xiantang <986494...@qq.com>
AuthorDate: Tue Sep 10 15:03:26 2019 +0800
Polish. Add spaces
---
java/org/apache/tomcat/util/threads/LimitLatch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/threads/LimitLatch.java
b/java/org/apache/tomcat/util/threads/LimitLatch.java
index e868405..840ec55 100644
--- a/java/org/apache/tomcat/util/threads/LimitLatch.java
+++ b/java/org/apache/tomcat/util/threads/LimitLatch.java
@@ -126,7 +126,7 @@ public class LimitLatch {
long result = getCount();
if (log.isDebugEnabled()) {
log.debug("Counting down["+Thread.currentThread().getName()+"]
latch="+result);
-}
+}
return result;
}
-
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 issue #201: Avoid NPE in NamingContextListener.getGlobalNamingContext with Embedded containers
markt-asf commented on issue #201: Avoid NPE in NamingContextListener.getGlobalNamingContext with Embedded containers URL: https://github.com/apache/tomcat/pull/201#issuecomment-530479424 Thanks for the PR. It has been applied (along with a changelog entry) to master, 8.5.x and 7.0.x 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #201: Avoid NPE in NamingContextListener.getGlobalNamingContext with Embedded containers
markt-asf closed pull request #201: Avoid NPE in NamingContextListener.getGlobalNamingContext with Embedded containers URL: https://github.com/apache/tomcat/pull/201 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 With regards, Apache Git Services - 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 potential NPE in some embedding scenarios.
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 07270ed Fix potential NPE in some embedding scenarios.
07270ed is described below
commit 07270ed6e9bd04fdea5b0aeb5330021c66023899
Author: Mark Thomas
AuthorDate: Wed Sep 11 18:17:04 2019 +0100
Fix potential NPE in some embedding scenarios.
When embedding a Service directly and JNDI is enabled there is no Server
---
java/org/apache/catalina/core/NamingContextListener.java | 6 +-
webapps/docs/changelog.xml | 5 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 8bbfce8..0b99d55 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -1113,7 +1113,11 @@ public class NamingContextListener
private javax.naming.Context getGlobalNamingContext() {
if (container instanceof Context) {
Engine e = (Engine) ((Context) container).getParent().getParent();
-return e.getService().getServer().getGlobalNamingContext();
+Server s = e.getService().getServer();
+// When the Service is an embedded Service, there is no Server
+if (s != null) {
+return s.getGlobalNamingContext();
+}
}
return null;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1f94919..6d8c54a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -98,6 +98,11 @@
RealmBase.hasRole() for given security constraints.
(michaelo)
+
+Avoid a potential NullPointerException on Service stop if
a
+Service is embedded directly (i.e. with no Server) in an applciation
+and JNDI is enabled. Patch provided by S. Ali Tokmen. (markt)
+
-
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 potential NPE in some embedding scenarios.
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 58e1d3f Fix potential NPE in some embedding scenarios.
58e1d3f is described below
commit 58e1d3fed6d23ab0113bac5a848f85a3a2a0df14
Author: Mark Thomas
AuthorDate: Wed Sep 11 18:17:04 2019 +0100
Fix potential NPE in some embedding scenarios.
When embedding a Service directly and JNDI is enabled there is no Server
---
java/org/apache/catalina/core/NamingContextListener.java | 6 +-
webapps/docs/changelog.xml | 5 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 5f3f331..234492b 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -1102,7 +1102,11 @@ public class NamingContextListener
private javax.naming.Context getGlobalNamingContext() {
if (container instanceof Context) {
Engine e = (Engine) ((Context) container).getParent().getParent();
-return e.getService().getServer().getGlobalNamingContext();
+Server s = e.getService().getServer();
+// When the Service is an embedded Service, there is no Server
+if (s != null) {
+return s.getGlobalNamingContext();
+}
}
return null;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2365c9b..46de0ac 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,11 @@
RealmBase.hasRole() for given security constraints.
(michaelo)
+
+Avoid a potential NullPointerException on Service stop if
a
+Service is embedded directly (i.e. with no Server) in an applciation
+and JNDI is enabled. Patch provided by S. Ali Tokmen. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix potential NPE in some embedding scenarios.
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 e469527 Fix potential NPE in some embedding scenarios.
e469527 is described below
commit e469527d8da572b0483b485d7ed8cd1b998497ba
Author: Mark Thomas
AuthorDate: Wed Sep 11 18:17:04 2019 +0100
Fix potential NPE in some embedding scenarios.
When embedding a Service directly and JNDI is enabled there is no Server
---
java/org/apache/catalina/core/NamingContextListener.java | 6 +-
webapps/docs/changelog.xml | 5 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index f6f2132..0cacd3f 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -1102,7 +1102,11 @@ public class NamingContextListener
private javax.naming.Context getGlobalNamingContext() {
if (container instanceof Context) {
Engine e = (Engine) ((Context) container).getParent().getParent();
-return e.getService().getServer().getGlobalNamingContext();
+Server s = e.getService().getServer();
+// When the Service is an embedded Service, there is no Server
+if (s != null) {
+return s.getGlobalNamingContext();
+}
}
return null;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e28e49..3b19889 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -61,6 +61,11 @@
Host is configured with an xmlBase. Patch
provided by uk4sx. (markt)
+
+Avoid a potential NullPointerException on Service stop if
a
+Service is embedded directly (i.e. with no Server) in an applciation
+and JNDI is enabled. Patch provided by S. Ali Tokmen. (markt)
+
-
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: Remove translated strings for which no original String exists
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 b5454d5 Remove translated strings for which no original String exists b5454d5 is described below commit b5454d58148faa01730f52606026a2079324201f Author: Mark Thomas AuthorDate: Wed Sep 11 17:02:06 2019 +0100 Remove translated strings for which no original String exists --- java/javax/servlet/http/LocalStrings_es.properties | 1 - java/javax/servlet/http/LocalStrings_fr.properties | 1 - java/javax/servlet/http/LocalStrings_ja.properties | 1 - .../servlet/http/LocalStrings_zh_CN.properties | 3 ++- .../authenticator/LocalStrings_zh_CN.properties| 1 + .../catalina/connector/LocalStrings_es.properties | 1 - .../connector/LocalStrings_zh_CN.properties| 3 +++ .../catalina/core/LocalStrings_es.properties | 7 -- .../catalina/core/LocalStrings_fr.properties | 3 --- .../catalina/core/LocalStrings_ja.properties | 3 --- .../catalina/core/LocalStrings_zh_CN.properties| 9 ++- .../catalina/deploy/LocalStrings_zh_CN.properties | 1 + .../catalina/filters/LocalStrings_fr.properties| 2 ++ .../catalina/filters/LocalStrings_ko.properties| 2 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 1 + .../ha/deploy/LocalStrings_zh_CN.properties| 2 ++ .../ha/session/LocalStrings_zh_CN.properties | 3 +++ .../catalina/ha/tcp/LocalStrings_zh_CN.properties | 1 + .../catalina/loader/LocalStrings_es.properties | 2 -- .../catalina/loader/LocalStrings_fr.properties | 2 -- .../catalina/loader/LocalStrings_ja.properties | 2 -- .../catalina/loader/LocalStrings_ko.properties | 2 -- .../catalina/loader/LocalStrings_zh_CN.properties | 3 +-- .../catalina/manager/LocalStrings_ja.properties| 1 - .../catalina/manager/LocalStrings_ru.properties| 23 - .../manager/host/LocalStrings_ru.properties| 3 --- .../tcp => mbeans}/LocalStrings_zh_CN.properties | 3 +-- .../catalina/realm/LocalStrings_fr.properties | 1 + .../catalina/realm/LocalStrings_ko.properties | 1 + .../catalina/session/LocalStrings_zh_CN.properties | 1 + .../catalina/startup/LocalStrings_es.properties| 5 .../catalina/startup/LocalStrings_fr.properties| 5 .../catalina/startup/LocalStrings_ja.properties| 5 .../catalina/startup/LocalStrings_ko.properties| 3 --- .../catalina/startup/LocalStrings_zh_CN.properties | 29 +- .../catalina/util/LocalStrings_zh_CN.properties| 2 ++ .../catalina/valves/LocalStrings_fr.properties | 2 ++ .../catalina/valves/LocalStrings_ja.properties | 2 +- .../catalina/valves/LocalStrings_ko.properties | 2 ++ .../catalina/valves/LocalStrings_zh_CN.properties | 19 ++ .../apache/coyote/LocalStrings_zh_CN.properties| 2 +- .../apache/coyote/ajp/LocalStrings_es.properties | 1 - .../coyote/http11/LocalStrings_fr.properties | 2 ++ .../coyote/http11/LocalStrings_ko.properties | 2 ++ .../coyote/http11/LocalStrings_zh_CN.properties| 3 +++ .../jasper/resources/LocalStrings_es.properties| 1 - .../jasper/resources/LocalStrings_fr.properties| 1 - .../jasper/resources/LocalStrings_ja.properties| 1 - .../jasper/resources/LocalStrings_ko.properties| 1 - .../jasper/resources/LocalStrings_zh_CN.properties | 20 --- .../naming/factory/LocalStrings_zh_CN.properties | 2 ++ .../util/compat}/LocalStrings_zh_CN.properties | 3 +-- .../tomcat/util/http/LocalStrings_zh_CN.properties | 3 ++- .../util/http/parser/LocalStrings_fr.properties| 1 - .../util/http/parser/LocalStrings_ja.properties| 1 - .../util/http/parser/LocalStrings_ko.properties| 1 - .../tomcat/util/net/res/LocalStrings_es.properties | 10 .../tomcat/websocket/LocalStrings_fr.properties| 1 - .../tomcat/websocket/LocalStrings_ja.properties| 1 - .../tomcat/websocket/LocalStrings_ko.properties| 1 - .../tomcat/websocket/LocalStrings_zh_CN.properties | 3 +++ .../websocket/pojo/LocalStrings_zh_CN.properties | 3 +++ .../websocket/server/LocalStrings_de.properties| 1 - .../websocket/server/LocalStrings_es.properties| 1 - .../websocket/server/LocalStrings_fr.properties| 3 --- .../websocket/server/LocalStrings_ja.properties| 3 --- .../websocket/server/LocalStrings_ko.properties| 3 --- .../websocket/server/LocalStrings_zh_CN.properties | 2 +- 68 files changed, 122 insertions(+), 118 deletions(-) diff --git a/java/javax/servlet/http/LocalStrings_es.properties b/java/javax/servlet/http/LocalStrings_es.properties index b673735..0b7972e 100644 --- a/java/javax/servlet/http/LocalStrings_es.properties +++
[tomcat] 11/15: fix typo (an ssl)
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit fcca9621a8a36fba31a9dedad5602966c8e65e6e Author: KangZhiDong AuthorDate: Wed Sep 4 22:48:23 2019 +0800 fix typo (an ssl) --- conf/server.xml| 2 +- java/org/apache/catalina/realm/LocalStrings.properties | 2 +- java/org/apache/tomcat/jni/SSL.java| 2 +- java/org/apache/tomcat/jni/SSLContext.java | 6 +++--- java/org/apache/tomcat/jni/SSLSocket.java | 6 +++--- java/org/apache/tomcat/util/net/NioChannel.java| 2 +- java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +- webapps/docs/config/ajp.xml| 2 +- webapps/docs/config/http.xml | 2 +- webapps/docs/ssl-howto.xml | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conf/server.xml b/conf/server.xml index df638a3..502858c 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -78,7 +78,7 @@ connectionTimeout="2" redirectPort="8443" /> --> -
[tomcat] 13/15: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit f39f001bf6310ef448408845b5eff0ffdab3de13 Author: 康智冬 AuthorDate: Wed Sep 11 09:05:04 2019 +0800 Fix typo remove extra ‘a’ --- java/org/apache/catalina/util/SessionIdGeneratorBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/util/SessionIdGeneratorBase.java b/java/org/apache/catalina/util/SessionIdGeneratorBase.java index 2f4a4cb..bd93d32 100644 --- a/java/org/apache/catalina/util/SessionIdGeneratorBase.java +++ b/java/org/apache/catalina/util/SessionIdGeneratorBase.java @@ -44,7 +44,7 @@ public abstract class SessionIdGeneratorBase extends LifecycleBase * identifiers. If the queue is empty when a random number generator is * required, a new random number generator object is created. This is * designed this way since random number generators use a sync to make them - * thread-safe and the sync makes using a a single object slow(er). + * thread-safe and the sync makes using a single object slow(er). */ private final Queue randoms = new ConcurrentLinkedQueue(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 14/15: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 09a1756c6d9098e10b7985fa1771eb37a941eac2 Author: 康智冬 AuthorDate: Wed Sep 11 10:13:46 2019 +0800 Fix typo add missing javadoc --- java/org/apache/catalina/ha/session/BackupManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java index 565a824..b48aa7e 100644 --- a/java/org/apache/catalina/ha/session/BackupManager.java +++ b/java/org/apache/catalina/ha/session/BackupManager.java @@ -61,7 +61,7 @@ public class BackupManager extends ClusterManagerBase protected String name; /** - * + * Flag for how this map sends messages. */ private int mapSendOptions = Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 12/15: fix typo(an sql)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1177ce95177af8326a706aaa308df0e043a96c98
Author: KangZhiDong
AuthorDate: Fri Sep 6 22:53:51 2019 +0800
fix typo(an sql)
---
java/org/apache/catalina/realm/JDBCRealm.java | 6 +++---
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java| 4 ++--
.../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java| 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml| 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/realm/JDBCRealm.java
b/java/org/apache/catalina/realm/JDBCRealm.java
index 45e2faa..9679de2 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -339,7 +339,7 @@ public class JDBCRealm
// This needs rewritten with better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
@@ -546,7 +546,7 @@ public class JDBCRealm
// This needs rewritten with better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
@@ -627,7 +627,7 @@ public class JDBCRealm
// This needs rewritten wuth better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml
b/modules/jdbc-pool/doc/jdbc-pool.xml
index b21c01f..360ba43 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -119,7 +119,7 @@
The Tomcat connection pool offers a few additional features over what
most other pools let you do:
- initSQL - the ability to run a SQL statement exactly
once, when the connection is created
+ initSQL - the ability to run an SQL statement exactly
once, when the connection is created
validationInterval - in addition to running validations
on connections, avoid running them too frequently.
jdbcInterceptors - flexible and pluggable interceptors
to create any customizations around the pool,
the query execution and the result set handling. More on this in the
advanced section.
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
index 2359fc8..4ce7708 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
@@ -501,7 +501,7 @@ public interface PoolConfiguration {
* The SQL query that will be used to validate connections from this
* pool before returning them to the caller or pool.
* If specified, this query does not have to return any data,
- * it just can't throw a SQLException.
+ * it just can't throw an SQLException.
* The default value is null.
* Example values are SELECT 1(mysql),
* select 1 from dual(oracle),
@@ -514,7 +514,7 @@ public interface PoolConfiguration {
* The SQL query that will be used to validate connections from this
* pool before returning them to the caller or pool.
* If specified, this query does not have to return any data,
- * it just can't throw a SQLException.
+ * it just can't throw an SQLException.
* The default value is null.
* Example values are SELECT 1(mysql),
* select 1 from dual(oracle),
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
[tomcat] 10/15: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 035187b247199f15a0aec3a24585fc6701cafdb7
Author: 康智冬
AuthorDate: Tue Sep 3 21:48:48 2019 +0800
Fix typo
fix typo
---
java/org/apache/coyote/ajp/Constants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index 31121e0..8279966 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -114,7 +114,7 @@ public final class Constants {
// Ajp13 specific - needs refactoring for the new model
/**
- * Default maximum total byte size for a AJP packet
+ * Default maximum total byte size for an AJP packet
*/
public static final int MAX_PACKET_SIZE = 8192;
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 15/15: Update changelog for PR from KangZhiDong
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 09e80f5cbf1149e12d94beb70565179129dd6775 Author: Mark Thomas AuthorDate: Wed Sep 11 11:50:44 2019 +0100 Update changelog for PR from KangZhiDong --- webapps/docs/changelog.xml | 8 1 file changed, 8 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 58301fa..1f94919 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -133,6 +133,10 @@ application to enable release builds to be built with Java 10 onwards. (markt) + +Fix a large number of Javadoc and documentation typos. Patch provided by +KangZhiDong. (markt) + @@ -224,6 +228,10 @@ Fix JSSE_OPTS quoting in catalina.bat. Contributed by Peter Uhnak. (fschumacher) + +Remove unused i18n messages and associated translations. Patch provided +by KangZhiDong. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/15: fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit eaf3017e5e7022a83d2e6fc9cb937da7bbaac507
Author: kangzhidong
AuthorDate: Sat Aug 24 23:41:25 2019 +0800
fix typo
fix typo
---
java/org/apache/jasper/compiler/ELFunctionMapper.java | 2 +-
java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java | 4 ++--
java/org/apache/tomcat/util/modeler/Registry.java | 4 ++--
java/org/apache/tomcat/util/modeler/RegistryMBean.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java
b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index cadff84..1381979 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -287,7 +287,7 @@ public class ELFunctionMapper {
}
/*
- * @return An unique name for a function mapper.
+ * @return A unique name for a function mapper.
*/
private String getMapName() {
return "_jspx_fnmap_" + currFunc++;
diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
index 16ea265..03159ea 100644
--- a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
+++ b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
@@ -37,7 +37,7 @@ public interface TagPluginContext {
boolean isAttributeSpecified(String attribute);
/**
- * @return An unique temporary variable name that the plugin can use.
+ * @return A unique temporary variable name that the plugin can use.
*/
String getTemporaryVariableName();
@@ -50,7 +50,7 @@ public interface TagPluginContext {
/**
* Generate a declaration in the of the generated class. This can be
* used to declare an inner class, a method, or a class variable.
- * @param id An unique ID identifying the declaration. It is not
+ * @param id A unique ID identifying the declaration. It is not
* part of the declaration, and is used to ensure that the
* declaration will only appear once. If this method is
* invoked with the same id more than once in the translation
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 1a0aecc..829bc03 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -343,8 +343,8 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
* and for other operations we want to optimize.
*
* @param domain Namespace
- * @param name Type of the notification
- * @return An unique id for the domain:name combination
+ * @param name Type of the notification
+ * @return A unique id for the domain:name combination
* @since 1.1
*/
@Override
diff --git a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
index ae256e7..097167c 100644
--- a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
+++ b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
@@ -116,7 +116,7 @@ public interface RegistryMBean {
*
* @param domain Namespace
* @param name Type of the notification
- * @return An unique id for the domain:name combination
+ * @return A unique id for the domain:name combination
* @since 1.1
*/
public int getId( String domain, String name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/15: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 19f92c144c1dcb62b5bf790213a8a981044059be
Author: 康智冬
AuthorDate: Sat Aug 31 16:52:30 2019 +0800
Fix typo
---
java/org/apache/catalina/connector/Request.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 53f3925..33ddb97 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -277,7 +277,7 @@ public class Request implements HttpServletRequest {
/**
- * Using writer flag.
+ * Using reader flag.
*/
protected boolean usingReader = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/15: fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 654cacb9095f86d1004d2cbeb48f55e3f19caa13
Author: KangZhiDong
AuthorDate: Sun Sep 1 03:34:01 2019 +0800
fix typo
---
java/javax/servlet/http/HttpServletRequest.java | 2 +-
java/org/apache/jasper/compiler/JspConfig.java| 2 +-
java/org/apache/tomcat/util/digester/package.html | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/javax/servlet/http/HttpServletRequest.java
b/java/javax/servlet/http/HttpServletRequest.java
index 0c3f7f8..1fd6cb3 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -308,7 +308,7 @@ public interface HttpServletRequest extends ServletRequest {
* /xyz
*
*
- * To reconstruct an URL with a scheme and host, use
+ * To reconstruct a URL with a scheme and host, use
* {@link #getRequestURL}.
*
* @return a String containing the part of the URL from the
diff --git a/java/org/apache/jasper/compiler/JspConfig.java
b/java/org/apache/jasper/compiler/JspConfig.java
index df34f3c..8157138 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -457,7 +457,7 @@ public class JspConfig {
}
/**
- * To find out if an uri matches an url pattern in jsp config. If so,
+ * To find out if a uri matches a url pattern in jsp config. If so,
* then the uri is a JSP page. This is used primarily for jspc.
*/
public boolean isJspPage(String uri) throws JasperException {
diff --git a/java/org/apache/tomcat/util/digester/package.html
b/java/org/apache/tomcat/util/digester/package.html
index 6ffdf94..6446504 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -1049,9 +1049,9 @@ The public-identifier is an
additional free identifier whi
In practice, the weakness with a system-identifier is
that most parsers
-will attempt to interpret this URI as an URL, try to download the resource
directly
+will attempt to interpret this URI as a URL, try to download the resource
directly
from the URL and stop the parsing if this download fails. So, this means that
-almost always the URI will have to be an URL from which the declaration
+almost always the URI will have to be a URL from which the declaration
can be downloaded.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 09/15: fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 71aa3a90f8cf3e0ac9ed318ac78919fcc309c0ac
Author: KangZhiDong
AuthorDate: Sun Sep 1 04:21:45 2019 +0800
fix typo
---
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/javax/servlet/resources/web-common_3_0.xsd | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
java/org/apache/catalina/filters/LocalStrings.properties | 4 ++--
java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +-
java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++--
java/org/apache/tomcat/util/http/parser/Host.java | 4 ++--
java/org/apache/tomcat/websocket/server/UpgradeUtil.java | 2 +-
.../apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java| 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/connectors.xml | 2 +-
webapps/docs/ssl-howto.xml| 4 ++--
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/java/javax/servlet/resources/web-app_2_5.xsd
b/java/javax/servlet/resources/web-app_2_5.xsd
index f01830f..72a0f6a 100644
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd
b/java/javax/servlet/resources/web-common_3_0.xsd
index 8382e3e..6d5d875 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -593,7 +593,7 @@
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 3ba0141..308c1b4 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1080,7 +1080,7 @@ public class CorsFilter implements Filter {
*/
SIMPLE,
/**
- * A HTTP request that needs to be pre-flighted.
+ * An HTTP request that needs to be pre-flighted.
*/
ACTUAL,
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 3f2b136..649fde6 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -20,8 +20,8 @@ corsFilter.invalidSupportsCredentials=It is not allowed to
configure supportsCre
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
corsFilter.onlyHttp=CORS doesn't support non-HTTP request or response
-corsFilter.wrongType1=Expects a HttpServletRequest object of type [{0}]
-corsFilter.wrongType2=Expects a HttpServletRequest object of type [{0}] or
[{1}]
+corsFilter.wrongType1=Expects an HttpServletRequest object of type [{0}]
+corsFilter.wrongType2=Expects an HttpServletRequest object of type [{0}] or
[{1}]
csrfPrevention.invalidRandomClass=Unable to create Random source using class
[{0}]
diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
index 129df92..e06407d 100644
--- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
+++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.tomcat.util.ExceptionUtils;
/**
- * A HttpServletResponseWrapper, used from
+ * An HttpServletResponseWrapper, used from
* SSIServletExternalResolver
*
* @author Bip Thelin
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 11e7f31..3398d51 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -145,7 +145,7 @@ public final class FastHttpDateFormat {
/**
- * Try to parse the given date as a HTTP date.
+ * Try to parse the given date as an HTTP date.
* @param value The HTTP date
* @param threadLocalformats Ignored. The local array of
* ConcurrentDateFormat will always be used.
@@ -161,7 +161,7 @@ public final class FastHttpDateFormat
[tomcat] branch 8.5.x updated: Remove translated values for keys that have been removed
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 2f02d53 Remove translated values for keys that have been removed
2f02d53 is described below
commit 2f02d535aec15ed33e042a16ace06aab05315911
Author: Mark Thomas
AuthorDate: Wed Sep 11 15:16:19 2019 +0100
Remove translated values for keys that have been removed
---
.../tomcat/buildutil/translate/BackportTranslations.java | 10 ++
1 file changed, 10 insertions(+)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 6c27177..25c2d75 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -17,6 +17,8 @@
package org.apache.tomcat.buildutil.translate;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Properties;
/**
@@ -60,6 +62,14 @@ public class BackportTranslations extends BackportBase {
}
}
+// Remove translated values for keys that have been removed
+Iterator> iter =
targetTranslated.entrySet().iterator();
+while (iter.hasNext()) {
+Map.Entry entry = iter.next();
+if (!targetEnglish.containsKey(entry.getKey())) {
+iter.remove();
+}
+}
Utils.export(langauge, targetTranslated, storageDir);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/15: Add missing Javadoc
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f855be694a58167bfcdee8e5259bb97aeb8365a8
Author: Mark Thomas
AuthorDate: Wed Sep 11 15:20:01 2019 +0100
Add missing Javadoc
---
java/org/apache/catalina/security/SecurityUtil.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/security/SecurityUtil.java
b/java/org/apache/catalina/security/SecurityUtil.java
index ed5ff3a..046b78a 100644
--- a/java/org/apache/catalina/security/SecurityUtil.java
+++ b/java/org/apache/catalina/security/SecurityUtil.java
@@ -94,6 +94,7 @@ public final class SecurityUtil{
* @param methodName the method to apply the security restriction
* @param targetObject the Servlet on which the method will
* be called.
+ * @throws Exception an execution error occurred
*/
public static void doAsPrivilege(final String methodName,
final Servlet targetObject) throws
Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/15: fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c711162f08b4b7f4be8a4f31be6d75bacd4f5fdd Author: 康智冬 AuthorDate: Sat Aug 24 23:30:23 2019 +0800 fix typo fix typo --- webapps/docs/funcspecs/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/funcspecs/index.xml b/webapps/docs/funcspecs/index.xml index dfb7f30..4aa1433 100644 --- a/webapps/docs/funcspecs/index.xml +++ b/webapps/docs/funcspecs/index.xml @@ -59,7 +59,7 @@ still useful, because it provides an introduction to what Catalina does, without being as concerned with how this is accomplished. -TODO - Obviously, this area has a long ways to go before +TODO - Obviously, this area has a long way to go before it is complete. Contributions are welcome! - 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 (809d6a9 -> 09e80f5)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 809d6a9 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737 new f855be6 Add missing Javadoc new bee66a9 fix typo new c711162 fix typo new eaf3017 fix typo new 44c263d fix typo new 91bc1b2 Remove unused i18n messages (removal of translations to follow) new 19f92c1 Fix typo new 654cacb fix typo new 71aa3a9 fix typo new 035187b Fix typo new fcca962 fix typo (an ssl) new 1177ce9 fix typo(an sql) new f39f001 Fix typo new 09a1756 Fix typo new 09e80f5 Update changelog for PR from KangZhiDong The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conf/server.xml | 2 +- java/javax/servlet/http/HttpServletRequest.java | 2 +- java/javax/servlet/resources/web-app_2_5.xsd | 2 +- java/javax/servlet/resources/web-common_3_0.xsd | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- java/org/apache/catalina/connector/Request.java | 2 +- java/org/apache/catalina/filters/CorsFilter.java | 2 +- java/org/apache/catalina/filters/LocalStrings.properties | 4 ++-- java/org/apache/catalina/ha/session/BackupManager.java| 2 +- java/org/apache/catalina/loader/LocalStrings.properties | 2 -- java/org/apache/catalina/manager/LocalStrings_ru.properties | 1 - java/org/apache/catalina/realm/JDBCRealm.java | 6 +++--- java/org/apache/catalina/realm/LocalStrings.properties| 2 +- java/org/apache/catalina/security/SecurityUtil.java | 1 + java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +- java/org/apache/catalina/startup/LocalStrings.properties | 3 --- java/org/apache/catalina/util/SessionIdGeneratorBase.java | 2 +- java/org/apache/coyote/ajp/Constants.java | 2 +- java/org/apache/jasper/compiler/ELFunctionMapper.java | 2 +- java/org/apache/jasper/compiler/JspConfig.java| 2 +- java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java | 4 ++-- java/org/apache/jasper/resources/LocalStrings.properties | 1 - java/org/apache/tomcat/jni/SSL.java | 2 +- java/org/apache/tomcat/jni/SSLContext.java| 6 +++--- java/org/apache/tomcat/jni/SSLSocket.java | 6 +++--- java/org/apache/tomcat/util/digester/package.html | 4 ++-- java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++-- java/org/apache/tomcat/util/http/parser/Host.java | 4 ++-- java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 1 - java/org/apache/tomcat/util/modeler/Registry.java | 4 ++-- java/org/apache/tomcat/util/modeler/RegistryMBean.java| 2 +- java/org/apache/tomcat/util/modeler/package.html | 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 2 +- java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +- java/org/apache/tomcat/websocket/LocalStrings.properties | 1 - java/org/apache/tomcat/websocket/server/LocalStrings.properties | 3 --- java/org/apache/tomcat/websocket/server/UpgradeUtil.java | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml | 2 +- .../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 ++-- .../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java | 2 +- .../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 4 ++-- .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 2 +- webapps/docs/architecture/startup/serverStartup.txt | 2 +- webapps/docs/changelog.xml| 8 webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/cluster-valve.xml | 2 +- webapps/docs/config/http.xml | 2 +- webapps/docs/connectors.xml | 2 +- webapps/docs/funcspecs/index.xml | 2 +- webapps/docs/mbeans-descriptors-howto.xml | 2 +-
[tomcat] 02/15: fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit bee66a907da6b4d093c8b056766cf770c297f8b4 Author: kangzhidong AuthorDate: Wed Aug 21 23:59:54 2019 +0800 fix typo --- java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java| 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java| 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- java/org/apache/tomcat/util/modeler/package.html| 2 +- webapps/docs/mbeans-descriptors-howto.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java index 93b51a0..10ae4fd 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java @@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException; * * Examples: * - * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property IDataSender.9025.nrOfRequests + * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property IDataSender.9025.nrOfRequests * * * jmx:get diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index c5b9a97..d8140ed 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException; * * * Examples: - * Set a Mbean Manager attribute maxActiveSessions. + * Set an Mbean Manager attribute maxActiveSessions. * Set this attribute with fresh jmx connection without save reference * * diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java index 07f4597..7b5aa51 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java @@ -22,7 +22,7 @@ import javax.management.ObjectName; import org.apache.tools.ant.BuildException; /** - * unregister a MBean at JMX JSR 160 MBeans Server. + * unregister an MBean at JMX JSR 160 MBeans Server. * * unregister Mbeans * diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html index 8b2c6dd..41ecc63 100644 --- a/java/org/apache/catalina/ant/jmx/package.html +++ b/java/org/apache/catalina/ant/jmx/package.html @@ -41,13 +41,13 @@ existing one. The following attribute are exists in every tasks: username - The username of a MBeanServer auth, when configured. + The username of an MBeanServer auth, when configured. password - The password of a MBeanServer auth, when configured. + The password of an MBeanServer auth, when configured. diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html index a64f08a..c60fb52 100644 --- a/java/org/apache/tomcat/util/modeler/package.html +++ b/java/org/apache/tomcat/util/modeler/package.html @@ -215,7 +215,7 @@ registry metadata by hand, using the addManagedBean() and the standard support for loading a configuration file to be convenient and sufficient. -Modeler will also look for a mbeans-descriptors.xml in the same package +Modeler will also look for an mbeans-descriptors.xml in the same package with the class being registered and in its parent. If no metadata is found, modeler will use a number of simple patterns, similar with the ones used by ant, to determine a reasonable metadata diff --git a/webapps/docs/mbeans-descriptors-howto.xml b/webapps/docs/mbeans-descriptors-howto.xml index aa0e22e..9e4c5ca 100644 --- a/webapps/docs/mbeans-descriptors-howto.xml +++ b/webapps/docs/mbeans-descriptors-howto.xml @@ -49,7 +49,7 @@ in order to avoid a "ManagedBean is not found" exception. You may also add MBean descriptions for custom components in -a mbeans-descriptors.xml file, located in the same package as the class files +an mbeans-descriptors.xml file, located in the same package as the class files it describes. The permitted syntax for the mbeans-descriptors.xml is defined by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/15: fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 44c263dc43aaaff21139357be28229c6ca0868d5 Author: kangzhidong AuthorDate: Sun Aug 25 00:12:22 2019 +0800 fix typo --- webapps/docs/architecture/startup/serverStartup.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/architecture/startup/serverStartup.txt b/webapps/docs/architecture/startup/serverStartup.txt index ba83ddb..1904e82 100644 --- a/webapps/docs/architecture/startup/serverStartup.txt +++ b/webapps/docs/architecture/startup/serverStartup.txt @@ -77,7 +77,7 @@ What it does: c2) Starts the services under which are: StandardService -> starts Engine (ContainerBase -> Realm,Cluster etc) c3) StandardHost (started by the service) -Configures a ErrorReportValvem to do proper HTML output for different HTTP +Configures an ErrorReportValve to do proper HTML output for different HTTP errors codes Starts the Valves in the pipeline (at least the ErrorReportValve) Configures the StandardHostValve, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/15: Remove unused i18n messages (removal of translations to follow)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 91bc1b242569349c26f5d7beedbd169afaf5e200
Author: Mark Thomas
AuthorDate: Wed Sep 11 15:37:47 2019 +0100
Remove unused i18n messages (removal of translations to follow)
---
java/org/apache/catalina/loader/LocalStrings.properties | 2 --
java/org/apache/catalina/manager/LocalStrings_ru.properties | 1 -
java/org/apache/catalina/startup/LocalStrings.properties| 3 ---
java/org/apache/jasper/resources/LocalStrings.properties| 1 -
java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 1 -
java/org/apache/tomcat/websocket/LocalStrings.properties| 1 -
java/org/apache/tomcat/websocket/server/LocalStrings.properties | 3 ---
7 files changed, 12 deletions(-)
diff --git a/java/org/apache/catalina/loader/LocalStrings.properties
b/java/org/apache/catalina/loader/LocalStrings.properties
index 436a7ce..9639ec9 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -52,8 +52,6 @@ webappClassLoader.checkThreadLocalsForLeaksNull=The web
application [{0}] create
webappClassLoader.checkThreadsHttpClient=Found HttpClient keep-alive thread
using web application class loader. Fixed by switching thread to the parent
class loader.
webappClassLoader.clearJdbc=The web application [{0}] registered the JDBC
driver [{1}] but failed to unregister it when the web application was stopped.
To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
webappClassLoader.clearObjectStreamClassCachesFail=Failed to clear soft
references from ObjectStreamClass$Caches for web application [{0}]
-webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}]
ResourceBundle references from the cache for web application [{1}]
-webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear
ResourceBundle references for web application [{0}]
webappClassLoader.clearRmi=Found RMI Target with stub class class [{0}] and
value [{1}]. This RMI Target has been forcibly removed to prevent a memory leak.
webappClassLoader.clearRmiFail=Failed to clear context class loader referenced
from sun.rmi.transport.Target for web application [{0}]
webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target
to clear context class loader for web application [{0}]. This is expected on
non-Sun JVMs.
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index f742471..7e79891 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -162,7 +162,6 @@ managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагр
managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could
not be started
managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
-managerServlet.storeConfig.invalidMBean=ОШИБКА - Не удалось найти StoreConfig
Mbean
managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean,
зарегистрированный на [{0}]
managerServlet.threaddump=OK - JVM thread dump
managerServlet.trustedCertsNotConfigured=Для этого виртуального хоста не
настроены доверенные сертификаты безопасности
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index cb76e8e..a405f28 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -32,7 +32,6 @@ contextConfig.authenticatorInstantiate=Cannot instantiate an
authenticator of cl
contextConfig.authenticatorMissing=Cannot configure an authenticator for
method [{0}]
contextConfig.authenticatorResources=Cannot load authenticators mapping list
contextConfig.badUrl=Unable to process context descriptor [{0}]
-contextConfig.baseError=Unable to determine location of global configuration
(usually $CATALINA_BASE/conf)
contextConfig.cce=Lifecycle event data object [{0}] is not a Context
contextConfig.contextClose=Error closing context.xml
contextConfig.contextMissing=Missing context.xml: [{0}]
@@ -47,7 +46,6 @@ contextConfig.init=ContextConfig: Initializing
contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}]
for annotations
contextConfig.inputStreamJndi=Unable to process resource element [{0}] for
annotations
-contextConfig.invalidSci=The ServletContentInitializer [{0}] could not be
created
contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check
against the @HandlesTypes annotation of one or more ServletContentInitializers.
[tomcat] branch master updated: Remove translated values for keys that have been removed
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 bee2dbb Remove translated values for keys that have been removed
bee2dbb is described below
commit bee2dbb19986dbc060de30c31c3956ee31b04a01
Author: Mark Thomas
AuthorDate: Wed Sep 11 15:16:19 2019 +0100
Remove translated values for keys that have been removed
---
.../tomcat/buildutil/translate/BackportTranslations.java | 10 ++
1 file changed, 10 insertions(+)
diff --git
a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 6c27177..25c2d75 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -17,6 +17,8 @@
package org.apache.tomcat.buildutil.translate;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Properties;
/**
@@ -60,6 +62,14 @@ public class BackportTranslations extends BackportBase {
}
}
+// Remove translated values for keys that have been removed
+Iterator> iter =
targetTranslated.entrySet().iterator();
+while (iter.hasNext()) {
+Map.Entry entry = iter.next();
+if (!targetEnglish.containsKey(entry.getKey())) {
+iter.remove();
+}
+}
Utils.export(langauge, targetTranslated, storageDir);
}
}
-
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: Add missing Javadoc
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 d379740 Add missing Javadoc
d379740 is described below
commit d37974014ae9b251d76cda7042da3caf5c8cba72
Author: Mark Thomas
AuthorDate: Wed Sep 11 15:19:50 2019 +0100
Add missing Javadoc
---
java/org/apache/catalina/security/SecurityUtil.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/security/SecurityUtil.java
b/java/org/apache/catalina/security/SecurityUtil.java
index 5736ca5..4a550ea 100644
--- a/java/org/apache/catalina/security/SecurityUtil.java
+++ b/java/org/apache/catalina/security/SecurityUtil.java
@@ -93,6 +93,7 @@ public final class SecurityUtil{
* @param methodName the method to apply the security restriction
* @param targetObject the Servlet on which the method will
* be called.
+ * @throws Exception an execution error occurred
*/
public static void doAsPrivilege(final String methodName,
final Servlet targetObject) throws
Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/18: Fix typo
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 91fece3efba50ddb8efc96b592ebd23548029fab Author: 康智冬 AuthorDate: Sat Aug 31 16:52:30 2019 +0800 Fix typo --- java/org/apache/catalina/connector/Request.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index c58cda1..3b49e55 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -276,7 +276,7 @@ public class Request implements org.apache.catalina.servlet4preview.http.HttpSer /** - * Using writer flag. + * Using reader flag. */ protected boolean usingReader = false; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 14/18: Fix typo
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 50b4075c96040777d9919a32f26ebb85f20a6438 Author: 康智冬 AuthorDate: Wed Sep 11 09:05:04 2019 +0800 Fix typo remove extra ‘a’ --- java/org/apache/catalina/util/SessionIdGeneratorBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/util/SessionIdGeneratorBase.java b/java/org/apache/catalina/util/SessionIdGeneratorBase.java index ca3d636..c0a2a2f 100644 --- a/java/org/apache/catalina/util/SessionIdGeneratorBase.java +++ b/java/org/apache/catalina/util/SessionIdGeneratorBase.java @@ -44,7 +44,7 @@ public abstract class SessionIdGeneratorBase extends LifecycleBase * identifiers. If the queue is empty when a random number generator is * required, a new random number generator object is created. This is * designed this way since random number generators use a sync to make them - * thread-safe and the sync makes using a a single object slow(er). + * thread-safe and the sync makes using a single object slow(er). */ private final Queue randoms = new ConcurrentLinkedQueue<>(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 12/18: fix typo
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 ad7563b50a0780a09b71aed51c204cc7aa6e3bd9
Author: KangZhiDong
AuthorDate: Wed Sep 4 22:51:13 2019 +0800
fix typo
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 57a17eb..7545272 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -55,7 +55,7 @@ public class SSLHostConfig implements Serializable {
protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
static {
-/* Default used if protocols is not configured, also used if
+/* Default used if protocols are not configured, also used if
* protocols="All"
*/
SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_SSLv2Hello);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/18: fix typo
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 0ab842e3c7cdc235a0272a30aee606cb4e3f8172
Author: kangzhidong
AuthorDate: Sat Aug 24 23:41:25 2019 +0800
fix typo
---
java/org/apache/jasper/compiler/ELFunctionMapper.java | 2 +-
java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java | 4 ++--
java/org/apache/tomcat/util/modeler/Registry.java | 2 +-
java/org/apache/tomcat/util/modeler/RegistryMBean.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java
b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index 8271783..ed004d9 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -295,7 +295,7 @@ public class ELFunctionMapper {
}
/*
- * @return An unique name for a function mapper.
+ * @return A unique name for a function mapper.
*/
private String getMapName() {
return "_jspx_fnmap_" + currFunc++;
diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
index 16ea265..03159ea 100644
--- a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
+++ b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
@@ -37,7 +37,7 @@ public interface TagPluginContext {
boolean isAttributeSpecified(String attribute);
/**
- * @return An unique temporary variable name that the plugin can use.
+ * @return A unique temporary variable name that the plugin can use.
*/
String getTemporaryVariableName();
@@ -50,7 +50,7 @@ public interface TagPluginContext {
/**
* Generate a declaration in the of the generated class. This can be
* used to declare an inner class, a method, or a class variable.
- * @param id An unique ID identifying the declaration. It is not
+ * @param id A unique ID identifying the declaration. It is not
* part of the declaration, and is used to ensure that the
* declaration will only appear once. If this method is
* invoked with the same id more than once in the translation
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index bedd91c..0be0aff 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -283,7 +283,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
*
* @param domain Namespace
* @param name Type of the notification
- * @return An unique id for the domain:name combination
+ * @return A unique id for the domain:name combination
* @since 1.1
*/
@Override
diff --git a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
index 17317ea..dd2debf 100644
--- a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
+++ b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
@@ -103,7 +103,7 @@ public interface RegistryMBean {
*
* @param domain Namespace
* @param name Type of the notification
- * @return An unique id for the domain:name combination
+ * @return A unique id for the domain:name combination
* @since 1.1
*/
public int getId(String domain, String name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 09/18: fix typo
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 ae9741ab9d19b4023e024fbc62867f77e436dc73
Author: KangZhiDong
AuthorDate: Sun Sep 1 04:21:45 2019 +0800
fix typo
---
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/javax/servlet/resources/web-common_3_0.xsd | 2 +-
java/javax/servlet/resources/web-common_3_1.xsd | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
java/org/apache/catalina/filters/LocalStrings.properties | 4 ++--
java/org/apache/catalina/servlet4preview/http/PushBuilder.java| 4 ++--
java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++--
java/org/apache/tomcat/util/http/parser/Host.java | 4 ++--
java/org/apache/tomcat/util/http/parser/MediaType.java| 2 +-
java/org/apache/tomcat/websocket/server/UpgradeUtil.java | 2 +-
test/org/apache/catalina/valves/rewrite/TestRewriteValve.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/connectors.xml | 2 +-
webapps/docs/rewrite.xml | 6 +++---
webapps/docs/ssl-howto.xml| 8
18 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/java/javax/servlet/resources/web-app_2_5.xsd
b/java/javax/servlet/resources/web-app_2_5.xsd
index f01830f..72a0f6a 100644
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd
b/java/javax/servlet/resources/web-common_3_0.xsd
index 8382e3e..6d5d875 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -593,7 +593,7 @@
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/javax/servlet/resources/web-common_3_1.xsd
b/java/javax/servlet/resources/web-common_3_1.xsd
index fc0529b..c006c3b 100644
--- a/java/javax/servlet/resources/web-common_3_1.xsd
+++ b/java/javax/servlet/resources/web-common_3_1.xsd
@@ -566,7 +566,7 @@
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index f5ac0fa..c32bd30 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1063,7 +1063,7 @@ public class CorsFilter implements Filter {
*/
SIMPLE,
/**
- * A HTTP request that needs to be pre-flighted.
+ * An HTTP request that needs to be pre-flighted.
*/
ACTUAL,
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 3f2b136..649fde6 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -20,8 +20,8 @@ corsFilter.invalidSupportsCredentials=It is not allowed to
configure supportsCre
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
corsFilter.onlyHttp=CORS doesn't support non-HTTP request or response
-corsFilter.wrongType1=Expects a HttpServletRequest object of type [{0}]
-corsFilter.wrongType2=Expects a HttpServletRequest object of type [{0}] or
[{1}]
+corsFilter.wrongType1=Expects an HttpServletRequest object of type [{0}]
+corsFilter.wrongType2=Expects an HttpServletRequest object of type [{0}] or
[{1}]
csrfPrevention.invalidRandomClass=Unable to create Random source using class
[{0}]
diff --git a/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
b/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
index 991d446..f5f6426 100644
--- a/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
+++ b/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
@@ -84,7 +84,7 @@ public interface PushBuilder {
PushBuilder sessionId(String sessionId);
/**
[tomcat] 15/18: Fix typo
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 11fec6f5b7a72926ff8df856737c33dc33277288 Author: 康智冬 AuthorDate: Wed Sep 11 10:13:46 2019 +0800 Fix typo add missing javadoc --- java/org/apache/catalina/ha/session/BackupManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java index 1f5944b..1f4fa21 100644 --- a/java/org/apache/catalina/ha/session/BackupManager.java +++ b/java/org/apache/catalina/ha/session/BackupManager.java @@ -53,7 +53,7 @@ public class BackupManager extends ClusterManagerBase protected String name; /** - * + * Flag for how this map sends messages. */ private int mapSendOptions = Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 17/18: Update changelog for PR from KangZhiDong
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 c8ecb013705f6b19d1722b292d1eb12f449619e7 Author: Mark Thomas AuthorDate: Wed Sep 11 11:50:44 2019 +0100 Update changelog for PR from KangZhiDong --- webapps/docs/changelog.xml | 8 1 file changed, 8 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 38b2241..2365c9b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -95,6 +95,10 @@ application to enable release builds to be built with Java 10 onwards. (markt) + +Fix a large number of Javadoc and documentation typos. Patch provided by +KangZhiDong. (markt) + @@ -154,6 +158,10 @@ the registry entires are added to the 64-bit registry when using a 64-bit JVM. (markt) + +Remove unused i18n messages and associated translations. Patch provided +by KangZhiDong. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 11/18: fix typo (an ssl)
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 0263a8397c540969ba6f3a4e91612821d41cc7c6 Author: KangZhiDong AuthorDate: Wed Sep 4 22:48:23 2019 +0800 fix typo (an ssl) --- conf/server.xml | 4 ++-- java/org/apache/catalina/realm/LocalStrings.properties | 2 +- java/org/apache/catalina/startup/CertificateCreateRule.java | 2 +- java/org/apache/tomcat/jni/SSL.java | 6 +++--- java/org/apache/tomcat/jni/SSLConf.java | 2 +- java/org/apache/tomcat/jni/SSLContext.java | 6 +++--- java/org/apache/tomcat/jni/SSLSocket.java | 6 +++--- java/org/apache/tomcat/util/net/Nio2Channel.java| 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 2 +- java/org/apache/tomcat/util/net/SecureNio2Channel.java | 2 +- java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +- webapps/docs/changelog.xml | 2 +- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/http.xml| 2 +- webapps/docs/ssl-howto.xml | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/conf/server.xml b/conf/server.xml index fce8922..2cd78df 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -76,7 +76,7 @@ connectionTimeout="2" redirectPort="8443" /> --> - -
[tomcat] 04/18: fix typo
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 87e7de4f77f800f9cb6107c54e542ef6ff17211d
Author: kangzhidong
AuthorDate: Sun Aug 25 00:12:22 2019 +0800
fix typo
---
java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java | 2 +-
java/org/apache/tomcat/util/descriptor/tld/TldParser.java | 2 +-
webapps/docs/architecture/startup/serverStartup.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
index c098dc2..1fb48ea 100644
--- a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
@@ -62,7 +62,7 @@ public class TagPluginParser {
if (!handler.getWarnings().isEmpty() ||
!handler.getErrors().isEmpty()) {
handler.logFindings(log, source.getSystemId());
if (!handler.getErrors().isEmpty()) {
-// throw the first to indicate there was a error during
processing
+// throw the first to indicate there was an error during
processing
throw handler.getErrors().iterator().next();
}
}
diff --git a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
index 1c59516..e31c2fe 100644
--- a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
@@ -77,7 +77,7 @@ public class TldParser {
if (!handler.getWarnings().isEmpty() ||
!handler.getErrors().isEmpty()) {
handler.logFindings(log, source.getSystemId());
if (!handler.getErrors().isEmpty()) {
-// throw the first to indicate there was a error during
processing
+// throw the first to indicate there was an error during
processing
throw handler.getErrors().iterator().next();
}
}
diff --git a/webapps/docs/architecture/startup/serverStartup.txt
b/webapps/docs/architecture/startup/serverStartup.txt
index 716c8d0..c7c8c0d 100644
--- a/webapps/docs/architecture/startup/serverStartup.txt
+++ b/webapps/docs/architecture/startup/serverStartup.txt
@@ -77,7 +77,7 @@ What it does:
c2) Starts the services under which are:
StandardService -> starts Engine (ContainerBase -> Realm,Cluster
etc)
c3) StandardHost (started by the service)
-Configures a ErrorReportValvem to do proper HTML output for
different HTTP
+Configures an ErrorReportValve to do proper HTML output for
different HTTP
errors codes
Starts the Valves in the pipeline (at least the
ErrorReportValve)
Configures the StandardHostValve,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/18: add JASPIC 1.1 Javadoc
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 f809fb9bbae1ce325380e75af406feebca8cdd28
Author: kangzhidong
AuthorDate: Sun Aug 25 02:52:03 2019 +0800
add JASPIC 1.1 Javadoc
---
build.xml | 20
webapps/docs/jaspicapi/index.html | 34 ++
webapps/docs/project.xml | 1 +
3 files changed, 55 insertions(+)
diff --git a/build.xml b/build.xml
index 8b93675..04397b6 100644
--- a/build.xml
+++ b/build.xml
@@ -1934,6 +1934,26 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
+
+
+
+
+
+
http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+
+
+API docs
+
+
+
+
+The JASPIC Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/;>
+documentation bundle.
+
+
+
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 880c3a8..09cb4df 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -87,6 +87,7 @@
+
https://tomcat.apache.org/connectors-doc/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 08/18: fix typo
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 402cbb3969f67a053946d41723338ca7e879a2f5
Author: KangZhiDong
AuthorDate: Sun Sep 1 03:34:01 2019 +0800
fix typo
---
java/javax/servlet/http/HttpServletRequest.java | 2 +-
java/org/apache/jasper/compiler/JspConfig.java| 2 +-
java/org/apache/tomcat/util/digester/package.html | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/javax/servlet/http/HttpServletRequest.java
b/java/javax/servlet/http/HttpServletRequest.java
index fd9b44f..9c98fa2 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -308,7 +308,7 @@ public interface HttpServletRequest extends ServletRequest {
* /xyz
*
*
- * To reconstruct an URL with a scheme and host, use
+ * To reconstruct a URL with a scheme and host, use
* {@link #getRequestURL}.
*
* @return a String containing the part of the URL from the
diff --git a/java/org/apache/jasper/compiler/JspConfig.java
b/java/org/apache/jasper/compiler/JspConfig.java
index 493c8fb..373db7c 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -377,7 +377,7 @@ public class JspConfig {
}
/**
- * To find out if an uri matches an url pattern in jsp config. If so,
+ * To find out if a uri matches a url pattern in jsp config. If so,
* then the uri is a JSP page. This is used primarily for jspc.
* @param uri The path to check
* @return true if the path denotes a JSP page
diff --git a/java/org/apache/tomcat/util/digester/package.html
b/java/org/apache/tomcat/util/digester/package.html
index 0a16423..4438ac5 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -1008,9 +1008,9 @@ The public-identifier is an
additional free identifier whi
In practice, the weakness with a system-identifier is
that most parsers
-will attempt to interpret this URI as an URL, try to download the resource
directly
+will attempt to interpret this URI as a URL, try to download the resource
directly
from the URL and stop the parsing if this download fails. So, this means that
-almost always the URI will have to be an URL from which the declaration
+almost always the URI will have to be a URL from which the declaration
can be downloaded.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 16/18: Add link to newly added JASPIC 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 2b8f0b650d08320bad57c2f21f7461e27f14e022
Author: Mark Thomas
AuthorDate: Wed Sep 11 11:46:07 2019 +0100
Add link to newly added JASPIC docs
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 04397b6..54fb967 100644
--- a/build.xml
+++ b/build.xml
@@ -1978,6 +1978,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
+
https://docs.oracle.com/javase/7/docs/api/"/>
https://docs.oracle.com/javaee/7/api/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/18: Remove unused i18n messages (re3moval of translations to follow)
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 31cb35549d5d3976af3e8cd0440147efddc6e7fa
Author: Mark Thomas
AuthorDate: Wed Sep 11 13:20:57 2019 +0100
Remove unused i18n messages (re3moval of translations to follow)
---
java/org/apache/catalina/connector/LocalStrings.properties | 1 -
java/org/apache/catalina/core/LocalStrings.properties | 2 --
java/org/apache/catalina/loader/LocalStrings.properties | 9 -
java/org/apache/catalina/manager/LocalStrings.properties| 1 -
java/org/apache/catalina/manager/host/LocalStrings.properties | 1 -
java/org/apache/catalina/realm/LocalStrings.properties | 2 --
java/org/apache/catalina/startup/LocalStrings.properties| 6 --
java/org/apache/catalina/webresources/LocalStrings.properties | 2 --
java/org/apache/coyote/ajp/LocalStrings.properties | 2 --
java/org/apache/coyote/http11/LocalStrings.properties | 3 ---
java/org/apache/coyote/http2/LocalStrings.properties| 7 ---
java/org/apache/jasper/resources/LocalStrings.properties| 2 --
java/org/apache/tomcat/util/buf/LocalStrings.properties | 1 -
java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 1 -
java/org/apache/tomcat/util/net/LocalStrings.properties | 3 ---
java/org/apache/tomcat/util/net/jsse/LocalStrings.properties| 5 -
java/org/apache/tomcat/util/net/openssl/LocalStrings.properties | 5 -
java/org/apache/tomcat/websocket/LocalStrings.properties| 1 -
java/org/apache/tomcat/websocket/server/LocalStrings.properties | 3 ---
19 files changed, 57 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties
b/java/org/apache/catalina/connector/LocalStrings.properties
index c6ea9a4..cdb98ed 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=Encountered a
non-recycled request and recyc
coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and
recycled it forcedly.
coyoteAdapter.debug=The variable [{0}] has value [{1}]
coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an
existing request
-coyoteAdapter.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the
JRE. The Connector will continue to use [{1}]
coyoteConnector.invalidPort=The connector cannot start since the specified
port value of [{0}] is invalid
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 8f943c5..f0ed527 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -178,7 +178,6 @@ standardContext.manager=Configured a manager of class [{0}]
standardContext.managerFail=The session manager failed to start
standardContext.namingResource.destroy.fail=Failed to destroy old naming
resources
standardContext.namingResource.init.fail=Failed to init new naming resources
-standardContext.noResourceJar=Resource JARs are not supported. The JAR found
at [{0}] will not be used to provide static content for context with name [{1}]
standardContext.notStarted=Context with name [{0}] has not yet been started
standardContext.notWrapper=Child of a Context must be a Wrapper
standardContext.parameter.duplicate=Duplicate context initialization parameter
[{0}]
@@ -205,7 +204,6 @@ standardContext.startingContext=Exception starting Context
with name [{0}]
standardContext.stop.asyncWaitInterrupted=Interrupt received while waiting
unloadDelay milliseconds for in-flight asynchronous requests to complete.
Context stop will continue without further delay.
standardContext.stoppingContext=Exception stopping Context with name [{0}]
standardContext.threadBindingListenerError=An error occurred in the thread
binding listener configured for Context [{0}]
-standardContext.unknownCookieEncoding=The unknown encoding [{0}] was specified
for setCookieEncoding(String) so the default of UTF-8 will be used instead
standardContext.urlPattern.patternWarning=WARNING: URL pattern [{0}] must
start with a ''/'' in Servlet 2.4
standardContext.webappClassLoader.missingProperty=Unable to set the web
application class loader property [{0}] to [{1}] as the property does not exist.
standardContext.workCreateException=Failed to determine absolute work
directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]
diff --git a/java/org/apache/catalina/loader/LocalStrings.properties
b/java/org/apache/catalina/loader/LocalStrings.properties
index cea4b46..f1b1bf7 100644
---
[tomcat] 01/18: fix typo
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 3dabb929cf1c1be4c9363d9282c3c6191c4d663c Author: kangzhidong AuthorDate: Wed Aug 21 23:59:54 2019 +0800 fix typo --- java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java| 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java| 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- java/org/apache/tomcat/util/modeler/package.html| 2 +- webapps/docs/mbeans-descriptors-howto.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java index a538ea6..5f1bc83 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java @@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException; * * Examples: * - * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property IDataSender.9025.nrOfRequests + * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property IDataSender.9025.nrOfRequests * * * jmx:get diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index c81e9d0..74f2201 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException; * * * Examples: - * Set a Mbean Manager attribute maxActiveSessions. + * Set an Mbean Manager attribute maxActiveSessions. * Set this attribute with fresh jmx connection without save reference * * diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java index 62f1728..ba1ac1e 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java @@ -22,7 +22,7 @@ import javax.management.ObjectName; import org.apache.tools.ant.BuildException; /** - * unregister a MBean at JMX JSR 160 MBeans Server. + * unregister an MBean at JMX JSR 160 MBeans Server. * * unregister Mbeans * diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html index 121dfad..9277039 100644 --- a/java/org/apache/catalina/ant/jmx/package.html +++ b/java/org/apache/catalina/ant/jmx/package.html @@ -41,13 +41,13 @@ existing one. The following attribute are exists in every tasks: username - The username of a MBeanServer auth, when configured. + The username of an MBeanServer auth, when configured. password - The password of a MBeanServer auth, when configured. + The password of an MBeanServer auth, when configured. diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html index a64f08a..c60fb52 100644 --- a/java/org/apache/tomcat/util/modeler/package.html +++ b/java/org/apache/tomcat/util/modeler/package.html @@ -215,7 +215,7 @@ registry metadata by hand, using the addManagedBean() and the standard support for loading a configuration file to be convenient and sufficient. -Modeler will also look for a mbeans-descriptors.xml in the same package +Modeler will also look for an mbeans-descriptors.xml in the same package with the class being registered and in its parent. If no metadata is found, modeler will use a number of simple patterns, similar with the ones used by ant, to determine a reasonable metadata diff --git a/webapps/docs/mbeans-descriptors-howto.xml b/webapps/docs/mbeans-descriptors-howto.xml index a32e4f5..d9a7be2 100644 --- a/webapps/docs/mbeans-descriptors-howto.xml +++ b/webapps/docs/mbeans-descriptors-howto.xml @@ -49,7 +49,7 @@ in order to avoid a "ManagedBean is not found" exception. You may also add MBean descriptions for custom components in -a mbeans-descriptors.xml file, located in the same package as the class files +an mbeans-descriptors.xml file, located in the same package as the class files it describes. The permitted syntax for the mbeans-descriptors.xml is defined by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 13/18: fix typo(an sql)
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 3795213a021e2b17b8357ba42d9cd56c5a4e69ba
Author: KangZhiDong
AuthorDate: Fri Sep 6 22:53:51 2019 +0800
fix typo(an sql)
---
java/org/apache/catalina/realm/JDBCRealm.java | 6 +++---
java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java| 4 ++--
.../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java| 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml| 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/realm/JDBCRealm.java
b/java/org/apache/catalina/realm/JDBCRealm.java
index 3321b39..9f6c663 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -314,7 +314,7 @@ public class JDBCRealm
// This needs rewritten with better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
@@ -525,7 +525,7 @@ public class JDBCRealm
// This needs rewritten with better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
@@ -597,7 +597,7 @@ public class JDBCRealm
// This needs rewritten wuth better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
index eb0d09d..0cb852a 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
@@ -415,7 +415,7 @@ public class Jdbc41Bridge {
* Delegates to {@link Statement#closeOnCompletion()} without throwing a
{@link AbstractMethodError}.
*
* If the JDBC driver does not implement {@link
Statement#closeOnCompletion()}, then just check that the connection
- * is closed to then throw a SQLException.
+ * is closed to then throw an SQLException.
*
*
* @param statement
@@ -438,7 +438,7 @@ public class Jdbc41Bridge {
* Delegates to {@link Statement#isCloseOnCompletion()} without throwing a
{@link AbstractMethodError}.
*
* If the JDBC driver does not implement {@link
Statement#isCloseOnCompletion()}, then just check that the
- * connection is closed to then throw a SQLException.
+ * connection is closed to then throw an SQLException.
*
*
* @param statement
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
index 6f24f04..3f8d1af 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
import java.util.List;
/**
- * A SQLException based on a list of Throwable causes.
+ * An SQLException based on a list of Throwable causes.
*
* The first exception in the list is used as this exception's cause and is
accessible with the usual
* {@link #getCause()} while the complete list is accessible with {@link
#getCauseList()}.
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml
b/modules/jdbc-pool/doc/jdbc-pool.xml
index 0249108..59c979d 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -119,7 +119,7 @@
The Tomcat connection pool offers a few additional features over what
most other pools let you do:
- initSQL - the
[tomcat] 02/18: fix typo
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 a877a975ecd7ec26b57336d184cdbedf0cee5369 Author: 康智冬 AuthorDate: Sat Aug 24 23:30:23 2019 +0800 fix typo fix typo --- webapps/docs/funcspecs/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/funcspecs/index.xml b/webapps/docs/funcspecs/index.xml index 953833c..e754c8a 100644 --- a/webapps/docs/funcspecs/index.xml +++ b/webapps/docs/funcspecs/index.xml @@ -59,7 +59,7 @@ still useful, because it provides an introduction to what Catalina does, without being as concerned with how this is accomplished. -TODO - Obviously, this area has a long ways to go before +TODO - Obviously, this area has a long way to go before it is complete. Contributions are welcome! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 10/18: Fix typo
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 89d573a1f1a0956ef88795f6748b2fcb99ab2339
Author: 康智冬
AuthorDate: Tue Sep 3 21:48:48 2019 +0800
Fix typo
fix typo
---
java/org/apache/coyote/ajp/Constants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index 2fb6c34..245404b 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -84,7 +84,7 @@ public final class Constants {
// Ajp13 specific - needs refactoring for the new model
/**
- * Default maximum total byte size for a AJP packet
+ * Default maximum total byte size for an AJP packet
*/
public static final int MAX_PACKET_SIZE = 8192;
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (45b3f9b -> d5a6da8)
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 45b3f9b Polish. Spacing. new 3dabb92 fix typo new a877a97 fix typo new 0ab842e fix typo new 87e7de4 fix typo new f809fb9 add JASPIC 1.1 Javadoc new 31cb355 Remove unused i18n messages (re3moval of translations to follow) new 91fece3 Fix typo new 402cbb3 fix typo new ae9741a fix typo new 89d573a Fix typo new 0263a83 fix typo (an ssl) new ad7563b fix typo new 3795213 fix typo(an sql) new 50b4075 Fix typo new 11fec6f Fix typo new 2b8f0b6 Add link to newly added JASPIC docs new c8ecb01 Update changelog for PR from KangZhiDong new d5a6da8 Remove translated entries for keys that have been removed The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 21 conf/server.xml| 4 +-- java/javax/servlet/http/HttpServletRequest.java| 2 +- .../servlet/http/LocalStrings_zh_CN.properties | 3 ++- java/javax/servlet/resources/web-app_2_5.xsd | 2 +- java/javax/servlet/resources/web-common_3_0.xsd| 2 +- java/javax/servlet/resources/web-common_3_1.xsd| 2 +- .../catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- .../ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 +-- .../authenticator/LocalStrings_zh_CN.properties| 1 + .../catalina/connector/LocalStrings.properties | 1 - .../catalina/connector/LocalStrings_de.properties | 1 - .../catalina/connector/LocalStrings_es.properties | 1 - .../catalina/connector/LocalStrings_fr.properties | 1 - .../catalina/connector/LocalStrings_ja.properties | 1 - .../catalina/connector/LocalStrings_ko.properties | 1 - .../catalina/connector/LocalStrings_ru.properties | 1 - .../connector/LocalStrings_zh_CN.properties| 4 ++- java/org/apache/catalina/connector/Request.java| 2 +- .../apache/catalina/core/LocalStrings.properties | 2 -- .../catalina/core/LocalStrings_es.properties | 3 --- .../catalina/core/LocalStrings_fr.properties | 2 -- .../catalina/core/LocalStrings_ja.properties | 2 -- .../catalina/core/LocalStrings_ko.properties | 2 -- .../catalina/core/LocalStrings_zh_CN.properties| 10 ++-- .../catalina/deploy/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/filters/CorsFilter.java | 2 +- .../catalina/filters/LocalStrings.properties | 4 +-- .../catalina/filters/LocalStrings_fr.properties| 2 ++ .../catalina/filters/LocalStrings_ko.properties| 2 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 1 + .../ha/deploy/LocalStrings_zh_CN.properties| 2 ++ .../apache/catalina/ha/session/BackupManager.java | 2 +- .../ha/session/LocalStrings_zh_CN.properties | 3 +++ .../catalina/ha/tcp/LocalStrings_zh_CN.properties | 1 + .../apache/catalina/loader/LocalStrings.properties | 9 --- .../catalina/loader/LocalStrings_de.properties | 1 - .../catalina/loader/LocalStrings_es.properties | 8 -- .../catalina/loader/LocalStrings_fr.properties | 9 --- .../catalina/loader/LocalStrings_ja.properties | 9 --- .../catalina/loader/LocalStrings_ko.properties | 9 --- .../catalina/loader/LocalStrings_zh_CN.properties | 6 + .../catalina/manager/LocalStrings.properties | 1 - .../catalina/manager/LocalStrings_fr.properties| 1 - .../catalina/manager/LocalStrings_ja.properties| 1 - .../catalina/manager/LocalStrings_ko.properties| 1 - .../catalina/manager/LocalStrings_ru.properties| 3 --- .../catalina/manager/LocalStrings_zh_CN.properties | 1 - .../catalina/manager/host/LocalStrings.properties | 1 - .../manager/host/LocalStrings_fr.properties| 1 - .../manager/host/LocalStrings_ja.properties| 1 - .../manager/host/LocalStrings_ko.properties| 1 - .../manager/host/LocalStrings_ru.properties| 1 - .../manager/host/LocalStrings_zh_CN.properties | 1 - .../LocalStrings_zh_CN.properties | 2 +- java/org/apache/catalina/realm/JDBCRealm.java | 6 ++--- .../apache/catalina/realm/LocalStrings.properties | 4 +-- .../catalina/realm/LocalStrings_de.properties | 1 - .../catalina/realm/LocalStrings_es.properties | 1 - .../catalina/realm/LocalStrings_fr.properties | 3 +-- .../catalina/realm/LocalStrings_ja.properties | 2 --
[GitHub] [tomcat] KangZhiDong commented on issue #197: Remove unuse catch exception
KangZhiDong commented on issue #197: Remove unuse catch exception URL: https://github.com/apache/tomcat/pull/197#issuecomment-530369535 duplicate exception handling @markt-asf 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] KangZhiDong closed pull request #197: Remove unuse catch exception
KangZhiDong closed pull request #197: Remove unuse catch exception URL: https://github.com/apache/tomcat/pull/197 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] KangZhiDong commented on issue #194: fix typo
KangZhiDong commented on issue #194: fix typo URL: https://github.com/apache/tomcat/pull/194#issuecomment-530367386 It seems to have been merged 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] KangZhiDong closed pull request #194: fix typo
KangZhiDong closed pull request #194: fix typo URL: https://github.com/apache/tomcat/pull/194 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Restore JDBC store keys removed in error
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 15928ab Restore JDBC store keys removed in error
15928ab is described below
commit 15928aba23fbf72deab1a7519f06b3018efbd78d
Author: Mark Thomas
AuthorDate: Wed Sep 11 13:28:56 2019 +0100
Restore JDBC store keys removed in error
---
java/org/apache/catalina/session/LocalStrings.properties | 7 +++
java/org/apache/catalina/session/LocalStrings_de.properties| 1 +
java/org/apache/catalina/session/LocalStrings_es.properties| 5 +
java/org/apache/catalina/session/LocalStrings_fr.properties| 7 +++
java/org/apache/catalina/session/LocalStrings_ja.properties| 7 +++
java/org/apache/catalina/session/LocalStrings_ko.properties| 7 +++
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 2 ++
7 files changed, 36 insertions(+)
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index 91a42e8..e0a5487 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -14,10 +14,17 @@
# limitations under the License.
JDBCStore.SQLException=SQL Error [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found
[{0}]
+JDBCStore.checkConnectionDBClosed=The database connection is null or was found
to be closed. Trying to re-open it.
+JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The
database could be down.
+JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
JDBCStore.close=Exception closing database connection [{0}]
+JDBCStore.commitSQLException=SQLException committing connection before closing
JDBCStore.loading=Loading Session [{0}] from database [{1}]
+JDBCStore.missingDataSourceName=No valid JNDI name was given.
JDBCStore.removing=Removing Session [{0}] at database [{1}]
JDBCStore.saving=Saving Session [{0}] to database [{1}]
+JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
fileStore.createFailed=Unable to create directory [{0}] for the storage of
session data
fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the
creation of the session storage location
diff --git a/java/org/apache/catalina/session/LocalStrings_de.properties
b/java/org/apache/catalina/session/LocalStrings_de.properties
index 3a44ac3..822c5bd 100644
--- a/java/org/apache/catalina/session/LocalStrings_de.properties
+++ b/java/org/apache/catalina/session/LocalStrings_de.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+JDBCStore.missingDataSourceName=Kein gültiger JNDI Namen wurde übergeben.
JDBCStore.saving=Speichere Session [{0}] in Datenbank [{1}]
fileStore.deleteFailed=Kann Datei [{0}] nicht löschen. Das verhindert das
Erzeugen des Ablageortes für die Session-Ablage
diff --git a/java/org/apache/catalina/session/LocalStrings_es.properties
b/java/org/apache/catalina/session/LocalStrings_es.properties
index 22d072b..fe1a98e 100644
--- a/java/org/apache/catalina/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/session/LocalStrings_es.properties
@@ -14,8 +14,13 @@
# limitations under the License.
JDBCStore.SQLException=Error SQL [{0}]
+JDBCStore.checkConnectionClassNotFoundException=No se ha hallado la clase del
manejador (driver) JDBC [{0}]
+JDBCStore.checkConnectionDBClosed=La conexióna a base de datos es nula o está
cerrada. Intentando reabrirla.
+JDBCStore.checkConnectionDBReOpenFail=Falló la reapertura de la base de datos.
Puede que la base de datos esté caída.
+JDBCStore.checkConnectionSQLException=Ha tenido lugar una excepción SQL [{0}]
JDBCStore.close=Excepción cerrando conexión a base de datos [{0}]
JDBCStore.loading=Cargando Sesión [{0}] desde base de datos [{1}]
+JDBCStore.missingDataSourceName=No se proporcionó un nombre JNDI válido
JDBCStore.removing=Quitando Sesión [{0}] en base de datos [{1}]
JDBCStore.saving=Salvando Sesión [{0}] en base de datos [{1}]
diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties
b/java/org/apache/catalina/session/LocalStrings_fr.properties
index f533662..a2907fd 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -14,10 +14,17 @@
# limitations under the License.
JDBCStore.SQLException=Erreur SQL [{0}]
+JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a
pas été trouvée [{0}]
+JDBCStore.checkConnectionDBClosed=La connexion à la base de données est nulle
ou a été trouvée fermée. Tentative de réouverture.
+JDBCStore.checkConnectionDBReOpenFail=La tentative de réouverture de la base
[GitHub] [tomcat] xiantang commented on a change in pull request #194: fix typo
xiantang commented on a change in pull request #194: fix typo URL: https://github.com/apache/tomcat/pull/194#discussion_r323195835 ## File path: webapps/docs/windows-auth-howto.xml ## @@ -101,7 +101,7 @@ policy had to be relaxed. This is not recommended for production environments. service class/host:port/service name. The SPN used in this how-to is HTTP/win-tc01.dev.local. To map the user to the SPN, run the following: - setspn -A HTTP/win-tc01.dev.local tc01 + setspn -An HTTP/win-tc01.dev.local tc01 Review comment: > I'm about 2/3 of the way through the commits. With the benefit of experience, 1 PR vs multiple PRs doesn't make that much of a difference. What would have helped was re-basing the PR against master. I've done this locally and there were only a couple of conflicts and it makes it much easier to review. > > I spotted a few unused i18n strings that weren't removed from the translations. That isn't a big deal as the process we use to import/export to/from POEditor will clean those up. > > I have spotted a couple of minor issues. I'll fix those before merging the commits. I'll also comment on the commit in this PR where it makes sense to do so. lol ! It is so hard to review 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/07: Additional/improved simplified Chinese translations
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 0face1d3d4629c5d22b29ed09b91a7477f7cdd67
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:09:07 2019 +0100
Additional/improved simplified Chinese translations
---
.../servlet/http/LocalStrings_zh_CN.properties | 3 ++-
.../authenticator/LocalStrings_zh_CN.properties| 1 +
.../connector/LocalStrings_zh_CN.properties| 3 +++
.../catalina/core/LocalStrings_zh_CN.properties| 9 ++-
.../catalina/deploy/LocalStrings_zh_CN.properties | 1 +
.../catalina/filters/LocalStrings_zh_CN.properties | 1 +
.../ha/deploy/LocalStrings_zh_CN.properties| 2 ++
.../ha/session/LocalStrings_zh_CN.properties | 3 +++
.../catalina/ha/tcp/LocalStrings_zh_CN.properties | 1 +
.../catalina/loader/LocalStrings_zh_CN.properties | 1 +
.../catalina/manager/LocalStrings_zh_CN.properties | 1 +
.../catalina/mbeans/LocalStrings_zh_CN.properties | 1 +
.../catalina/session/LocalStrings_zh_CN.properties | 2 ++
.../catalina/startup/LocalStrings_zh_CN.properties | 29 ++
.../tribes/group/LocalStrings_zh_CN.properties | 1 +
.../interceptors/LocalStrings_zh_CN.properties | 1 +
.../membership/LocalStrings_zh_CN.properties | 1 +
.../tribes/transport/LocalStrings_zh_CN.properties | 1 +
.../transport/bio/LocalStrings_zh_CN.properties| 2 ++
.../transport/nio/LocalStrings_zh_CN.properties| 3 ++-
.../catalina/util/LocalStrings_zh_CN.properties| 2 ++
.../catalina/valves/LocalStrings_zh_CN.properties | 19 ++
.../webresources/LocalStrings_zh_CN.properties | 2 ++
.../apache/coyote/LocalStrings_zh_CN.properties| 2 +-
.../coyote/http11/LocalStrings_zh_CN.properties| 4 ++-
.../coyote/http2/LocalStrings_zh_CN.properties | 18 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 19 --
.../naming/factory/LocalStrings_zh_CN.properties | 2 ++
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../descriptor/web/LocalStrings_zh_CN.properties | 3 +++
.../tomcat/util/http/LocalStrings_zh_CN.properties | 3 ++-
.../tomcat/util/net/LocalStrings_zh_CN.properties | 5
.../util/net/jsse/LocalStrings_zh_CN.properties| 3 +++
.../tomcat/websocket/LocalStrings_zh_CN.properties | 4 +++
.../websocket/pojo/LocalStrings_zh_CN.properties | 3 +++
.../websocket/server/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4 +--
37 files changed, 152 insertions(+), 11 deletions(-)
diff --git a/java/javax/servlet/http/LocalStrings_zh_CN.properties
b/java/javax/servlet/http/LocalStrings_zh_CN.properties
index c471410..fbbd569 100644
--- a/java/javax/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/http/LocalStrings_zh_CN.properties
@@ -14,9 +14,10 @@
# limitations under the License.
err.cookie_name_blank=Cookie名称不能为null或零长度
+err.io.nullArray=Null在write方法中传递给字节数组
err.io.short_read=短.读
-http.method_delete_not_supported=此URL不支持Http方法DELETE
+http.method_delete_not_supported=当前URL不支持HTTP的DELETE方法
http.method_get_not_supported=此URL不支持Http方法GET
http.method_not_implemented=这个servlet没有为这个URI实现方法[{0}]
http.method_post_not_supported=此URL不支持Http方法POST
diff --git
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index e4d7a05..75cbdb7 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -36,6 +36,7 @@ digestAuthenticator.cacheRemove=已从客户端 nonce 缓存中删除有效条
singleSignOn.debug.cookieCheck=SSO检查SSO cookie
singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie
+singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index d9420ff..cb9b6ff 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -32,9 +32,12 @@ coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大，导致参数
coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理
coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
coyoteRequest.noMultipartConfig=由于没有提供multi-part配置，无法处理parts
+coyoteRequest.sendfileNotCanonical=无法确定指定用于sendfile的文件[{0}]的规范名称
+coyoteRequest.sessionEndAccessFail=在回收请求时，异常触发了对会话的结束访问。
coyoteRequest.setAttribute.namenull=不能在一个空的名字上调用setAttribute
coyoteResponse.encoding.invalid=JRE无法识别编码[{0}]
+coyoteResponse.sendError.ise=响应提交后无法调用sendError()
[tomcat] 07/07: Clean-up Russian translations
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 6f4767c7a58bcd077c20280d8d233f35c30027a2
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:12:51 2019 +0100
Clean-up Russian translations
---
java/org/apache/catalina/manager/LocalStrings_ru.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 60d07da..7e79891 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -145,6 +145,7 @@ managerServlet.reloaded=OK - Приложение по пути контекст
managerServlet.renameFail=ОШИБКА - Невозможно переименовать [{0}] в [{1}]. Это
может вызвать проблемы для будущих развертываний.
managerServlet.resourcesAll=OK - Перечислены глобальные ресурсы всех видов
managerServlet.resourcesType=OK - Перечислены глобальные ресурсы вида [{0}]
+managerServlet.saveFail=ОШИБКА - Не удалось сохранить настройки: [{0}]
managerServlet.saved=OK - Конфигурация сервера сохранена
managerServlet.savedContext=OK - Контекстные настройки для [{0}] сохранены
managerServlet.sessiondefaultmax=Стандартный максимальный период неактивного
сеанса: [{0}] минут
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/07: Additional French translations
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 6435c606f3b0492e58a75d65d324c7a837e9b86a
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:09:34 2019 +0100
Additional French translations
---
java/org/apache/catalina/filters/LocalStrings_fr.properties | 2 ++
java/org/apache/catalina/manager/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_fr.properties | 1 -
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/http11/LocalStrings_fr.properties| 2 ++
java/org/apache/coyote/http2/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 1 +
8 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index e2bfee6..11cdc1e 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -55,6 +55,8 @@ httpHeaderSecurityFilter.committed=Impossible d'ajouter les
en-têtes HTTP car l
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
remoteCidrFilter.noRemoteIp=Le client n'a pas d'adresse IP. Requête rejetée.
+remoteIpFilter.invalidHostHeader=La valeur invalide [{0}] a été trouvée pour
le Host dans l''en-tête HTTP [{1}]
+remoteIpFilter.invalidHostWithPort=La valeur de Host [{0}] dans l''en-tête
HTTP [{1}] contenait un numéro de port qui sera ingnoré
remoteIpFilter.invalidNumber=Nombre invalide pour le paramètre [{0}]: [{1}]
requestFilter.deny=Requête refusée pour [{0}] basée sur la propriété [{1}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 164cc24..4d9c55c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -157,6 +157,7 @@ managerServlet.reloaded=OK - L''application associée au
chemin de contexte [{0}
managerServlet.renameFail=ECHEC - N''a pas pu renommer [{0}] vers [{1}], cela
pourrait causer des problèmes pour de prochains déploiements
managerServlet.resourcesAll=OK - Liste des ressources globales de tout type
managerServlet.resourcesType=OK - Liste des ressources globales de type [{0}]
+managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a échoué:
[{0}]
managerServlet.saved=OK - Configuration serveur sauvegardée
managerServlet.savedContext=OK - Configuration du contexte [{0}] sauvegardée
managerServlet.serverInfo=OK - Informations sur le serveur\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties
b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index c1dcc6f..8f92038 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -100,6 +100,7 @@ realmBase.authenticateSuccess=Le nom d''utilisateur [{0}] a
été authentifié a
realmBase.cannotGetRoles=Impossible d''obtenir les rôles du principal [{0}]
realmBase.createUsernameRetriever.ClassCastException=La classe [{0}] n''est
pas un X509UsernameRetriever.
realmBase.createUsernameRetriever.newInstance=Impossible de créer un objet du
type [{0}]
+realmBase.credentialNotDelegated=Les identifiants de l'utilisateur [{0}} n'ont
pas été délégués alors que leur stockage a été requis
realmBase.delegatedCredentialFail=Impossible d''obtenir les identifiants
délégués pour l''utilisateur [{0}]
realmBase.digest=Erreur lors du hachage de l''identifiant utilisateur
realmBase.forbidden=L'accès à la ressource demandée a été interdit
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties
b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index e707c24..7554773 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -61,7 +61,6 @@ contextConfig.init=ContextConfig: Initialisation
contextConfig.inputStreamFile=Impossible de traiter les annotations du fichier
[{0}]
contextConfig.inputStreamJar=Impossible de traiter l''entrée [{0}] du JAR
[{1}] pour les annotations
contextConfig.inputStreamWebResource=Incapable de traiter les annotations de
la ressource web [{0}]
-contextConfig.invalidSci=Le ServletContainerInitializer [{0}] n''a pas pu être
crée
contextConfig.invalidSciHandlesTypes=Impossible de charger la classe [{0}]
pour la vérifier avec l''annotation @HandlesTypes d''un ou plusieurs
ServletContainerInitializer
contextConfig.jarFile=Impossible de traiter les annotations du JAR [{0}]
contextConfig.jspFile.error=Le fichier JSP [{0}] doit
[tomcat] 03/07: Import German translations
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 f93521466a6b62c5ea904ac5b660bf84d2ec9a94
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:10:57 2019 +0100
Import German translations
---
java/org/apache/catalina/loader/LocalStrings_de.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_de.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_de.properties| 2 +-
java/org/apache/jasper/resources/LocalStrings_de.properties | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/loader/LocalStrings_de.properties
b/java/org/apache/catalina/loader/LocalStrings_de.properties
index acd413d..a5cbe64 100644
--- a/java/org/apache/catalina/loader/LocalStrings_de.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_de.properties
@@ -15,4 +15,4 @@
webappClassLoader.checkThreadLocalsForLeaks.unknown=Unbekannt
webappClassLoader.readError=Fehler beim Lesen einer Ressource: Konnte [{0}]
nicht laden
-webappClassLoader.superCloseFail=Fehler beim Aufruf von close() auf der
Super-Klasse
\ No newline at end of file
+webappClassLoader.superCloseFail=Fehler beim Aufruf von close() auf der
Super-Klasse
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index e0075d8..21eb39d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -80,6 +80,7 @@ managerServlet.noWrapper=Container hat setWrapper() für
dieses Servlet nicht au
managerServlet.reloaded=OK - Anwendung mit Kontext Pfad [{0}] neu geladen
managerServlet.resourcesAll=OK - Auflistung globaler Ressourcen (alle Typen)
managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ [{0}]
+managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen:
[{0}]
managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal
[{0}] Minuten Inaktivität
managerServlet.sessions=OK - Sitzungs-Informationen für Anwendung mit Kontext
Pfad [{0}]
managerServlet.sessiontimeout=Inaktiv für [{0}] Minuten: [{1}] Sitzungen
diff --git a/java/org/apache/coyote/http11/LocalStrings_de.properties
b/java/org/apache/coyote/http11/LocalStrings_de.properties
index 2857350..577c224 100644
--- a/java/org/apache/coyote/http11/LocalStrings_de.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_de.properties
@@ -19,4 +19,4 @@ http11processor.socket.info=Ausnahme beim Lesen der
Informationen zum Socket
iib.invalidmethod=Ungültiges Zeichen in Methoden Namen gefunden. HTTP Methoden
Namen müssen Token nach RFC-7230 sein
-iob.failedwrite=Fehlgeschlagener Schreibvorgang
\ No newline at end of file
+iob.failedwrite=Fehlgeschlagener Schreibvorgang
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index b005318..591e5e9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -51,7 +51,6 @@ jsp.error.not.in.template=[{0}] ist nicht im Body des
Template Textes erlaubt
jsp.error.outputfolder=kein Ausgabeordner
jsp.error.page.invalid.scope=Falscher Scope
jsp.error.parse.xml=Fehler bei der Verarbeitung der XML Datei [{0}]
-jsp.error.plugin.wrongRootElement=Der Name des Wurzel Elementes in [{0}] ist
unterschiedlich zu dem von [{1}]
jsp.error.precompilation=Die JSP Datei [{0}] konnte nicht vorübersetzt werden.
jsp.error.reload=Erneutes Laden des Servlets schlug fehl
jsp.error.scripting.variable.missing_name=Kann den Namen der Skript Variable
vom Attribut [{0}] ableiten
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/07: Clean-up Japanese translations
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 578f58919860a2b4059a410fd774a1c0b480574f
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:11:41 2019 +0100
Clean-up Japanese translations
---
java/org/apache/catalina/manager/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/valves/LocalStrings_ja.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index e4cb441..0e13758 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -183,7 +183,6 @@ managerServlet.sslReloadFail=FAIL - TLS設定を再ロードできませんで
managerServlet.startFailed=FAIL - コンテキストパス [{0}] のアプリケーションが起動できません
managerServlet.started=OK - コンテキストパス [{0}] でアプリケーションを起動しました
managerServlet.stopped=OK - コンテキストパス [{0}] でアプリケーションを停止しました
-managerServlet.storeConfig.invalidMBean=FAIL - StoreConfig Mbean がありません。[{3}]
は不正な Mbean 名です。
managerServlet.storeConfig.noMBean=FAIL - [{0}] に StoreConfig Mbean
が登録されていません。一般的には StoreConfigLifecycleListener が登録します。
managerServlet.threaddump=OK - JVMスレッドダンプ
managerServlet.trustedCertsNotConfigured=この仮想ホストには信頼できる証明書が構成されていません。
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties
b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index dee349d..c6dbcb9 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -127,7 +127,7 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=データベースのクローズに失敗しました。
jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
-remoteCidrValve.invalid=[{0}] に不正な値が指定されました。詳細は前のメッセージを参照してください。
+remoteCidrValve.invalid="[{0}]" に不正な値が指定されました。詳細は前のメッセージを参照してください。
remoteCidrValve.noRemoteIp=クライアントの IP アドレスを取得できません。リクエストを拒否します。
remoteIpValve.invalidPortHeader=HTTP ヘッダー [{1}] に不正なポート番号 [{0}] が指定されました。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 0403187..6107fee 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -117,6 +117,7 @@ wsWebSocketContainer.invalidExtensionParameters=サーバーはクライアン
wsWebSocketContainer.invalidHeader=ヘッダー名と値の区切り文字(コロン)がない HTTP ヘッダー [{0}]
は解釈できないため無視します。
wsWebSocketContainer.invalidStatus=サーバー[{0}]からのHTTPレスポンスがWebSocketへのHTTPアップグレードを許可しませんでした。
wsWebSocketContainer.invalidSubProtocol=WebSocketサーバーは、Sec-WebSocket-Protocolヘッダーに複数の値を返しました。
+wsWebSocketContainer.maxBuffer=この実装はバッファの最大サイズをInteger.MAX_VALUEに制限します。
wsWebSocketContainer.missingAnnotation=POJOクラス[{0}]は@ClientEndpointでアノテーションされていないため使用できません。
wsWebSocketContainer.missingLocationHeader=HTTP レスポンスコード [{0}] を処理できません。レスポンスに
Location ヘッダーがありませんでした。
wsWebSocketContainer.missingWWWAuthenticateHeader=HTTP 応答コード [{0}]
を処理できません。応答ヘッダーに WWW-Authenticate ヘッダーがありません。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (30f1471 -> 6f4767c)
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 30f1471 Update changelog for PR from KangZhiDong new 0face1d Additional/improved simplified Chinese translations new 6435c60 Additional French translations new f935214 Import German translations new 39a642b Clean-up Spansih translations new 578f589 Clean-up Japanese translations new 776a560 Expand / improve Korean translations new 6f4767c Clean-up Russian translations The 7 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: .../servlet/http/LocalStrings_zh_CN.properties | 3 ++- .../authenticator/LocalStrings_zh_CN.properties| 1 + .../connector/LocalStrings_zh_CN.properties| 3 +++ .../catalina/core/LocalStrings_zh_CN.properties| 9 ++- .../catalina/deploy/LocalStrings_zh_CN.properties | 1 + .../catalina/filters/LocalStrings_fr.properties| 2 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 1 + .../ha/deploy/LocalStrings_zh_CN.properties| 2 ++ .../ha/session/LocalStrings_zh_CN.properties | 3 +++ .../catalina/ha/tcp/LocalStrings_zh_CN.properties | 1 + .../catalina/loader/LocalStrings_de.properties | 2 +- .../catalina/loader/LocalStrings_zh_CN.properties | 1 + .../catalina/manager/LocalStrings_de.properties| 1 + .../catalina/manager/LocalStrings_es.properties| 1 + .../catalina/manager/LocalStrings_fr.properties| 1 + .../catalina/manager/LocalStrings_ja.properties| 1 - .../catalina/manager/LocalStrings_ko.properties| 1 - .../catalina/manager/LocalStrings_ru.properties| 1 + .../catalina/manager/LocalStrings_zh_CN.properties | 1 + .../catalina/mbeans/LocalStrings_zh_CN.properties | 1 + .../catalina/realm/LocalStrings_fr.properties | 1 + .../catalina/session/LocalStrings_zh_CN.properties | 2 ++ .../catalina/startup/LocalStrings_es.properties| 1 - .../catalina/startup/LocalStrings_fr.properties| 1 - .../catalina/startup/LocalStrings_zh_CN.properties | 29 ++ .../tribes/group/LocalStrings_zh_CN.properties | 1 + .../interceptors/LocalStrings_zh_CN.properties | 1 + .../membership/LocalStrings_zh_CN.properties | 1 + .../tribes/transport/LocalStrings_zh_CN.properties | 1 + .../transport/bio/LocalStrings_zh_CN.properties| 2 ++ .../transport/nio/LocalStrings_zh_CN.properties| 3 ++- .../catalina/util/LocalStrings_zh_CN.properties| 2 ++ .../catalina/valves/LocalStrings_fr.properties | 2 ++ .../catalina/valves/LocalStrings_ja.properties | 2 +- .../catalina/valves/LocalStrings_zh_CN.properties | 19 ++ .../webresources/LocalStrings_zh_CN.properties | 2 ++ .../apache/coyote/LocalStrings_zh_CN.properties| 2 +- .../coyote/http11/LocalStrings_de.properties | 2 +- .../coyote/http11/LocalStrings_fr.properties | 2 ++ .../coyote/http11/LocalStrings_zh_CN.properties| 4 ++- .../apache/coyote/http2/LocalStrings_fr.properties | 1 + .../coyote/http2/LocalStrings_zh_CN.properties | 18 +- .../jasper/resources/LocalStrings_de.properties| 1 - .../jasper/resources/LocalStrings_es.properties| 4 +-- .../jasper/resources/LocalStrings_zh_CN.properties | 19 -- .../naming/factory/LocalStrings_zh_CN.properties | 2 ++ .../util/compat/LocalStrings_zh_CN.properties | 2 ++ .../descriptor/web/LocalStrings_zh_CN.properties | 3 +++ .../tomcat/util/http/LocalStrings_zh_CN.properties | 3 ++- .../tomcat/util/net/LocalStrings_zh_CN.properties | 5 .../util/net/jsse/LocalStrings_zh_CN.properties| 3 +++ .../tomcat/websocket/LocalStrings_fr.properties| 1 + .../tomcat/websocket/LocalStrings_ja.properties| 1 + .../tomcat/websocket/LocalStrings_ko.properties| 1 + .../tomcat/websocket/LocalStrings_zh_CN.properties | 4 +++ .../websocket/pojo/LocalStrings_zh_CN.properties | 3 +++ .../websocket/server/LocalStrings_zh_CN.properties | 1 + webapps/docs/changelog.xml | 8 -- 58 files changed, 175 insertions(+), 22 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/07: Expand / improve Korean translations
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 776a56038bb3b781c28ee639523d3c85210e9374
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:12:32 2019 +0100
Expand / improve Korean translations
---
java/org/apache/catalina/manager/LocalStrings_ko.properties | 1 -
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 1 +
webapps/docs/changelog.xml | 4
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 3fcae3a..0739007 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -182,7 +182,6 @@ managerServlet.sslReloadFail=실패 - TLS 설정을 다시 로드하지 못했
managerServlet.startFailed=실패 - 컨텍스트 경로 [{0}]의 애플리케이션이 시작될 수 없었습니다.
managerServlet.started=OK - 컨텍스트 경로 [{0}]의 애플리케이션이 시작되었습니다.
managerServlet.stopped=OK - 컨텍스트 경로 [{0}]의 애플리케이션을 중지시켰습니다.
-managerServlet.storeConfig.invalidMBean=실패 - StoreConfig Mbean을 찾을 수 없습니다.
[{0}]은(는) MBean을 위한 유효한 이름이 아닙니다.
managerServlet.storeConfig.noMBean=실패 - [{0}]에서 등록된 StoreConfig MBean이 없습니다.
보통 StoreConfigLifecycleListener에 의해 등록이 수행됩니다.
managerServlet.threaddump=OK - JVM 쓰레드 덤프
managerServlet.trustedCertsNotConfigured=이 가상 호스트를 위한 신뢰되는 인증서들이 설정되어 있지 않습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index e2f8f54..7ace6fa 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -117,6 +117,7 @@ wsWebSocketContainer.invalidExtensionParameters=서버가, 클라이언트가
wsWebSocketContainer.invalidHeader=[{0}] 내에서, 헤더 이름과 헤더 값을 구분하기 위한 콜론('':'')이
존재하지 않기에, HTTP 헤더를 파싱할 수 없습니다. 해당 헤더를 건너뛰었습니다.
wsWebSocketContainer.invalidStatus=서버 [{0}](으)로부터의 HTTP 응답은, 웹소켓으로 HTTP 업그레이드를
허용하지 않았습니다.
wsWebSocketContainer.invalidSubProtocol=웹소켓 서버가, 해당 Sec-WebSocket-Protocol 헤더를
위해 여러 값들을 반환했습니다.
+wsWebSocketContainer.maxBuffer=이 구현은 버퍼의 최대 크기를 Integer.MAX_VALUE로 제한합니다.
wsWebSocketContainer.missingAnnotation=@ClientEndpoint에 의해 annotate되지 않았기에,
POJO 클래스 [{0}]을(를) 사용할 수 없습니다.
wsWebSocketContainer.missingLocationHeader=HTTP 응답 코드 [{0}]을(를) 처리하지 못했습니다.
응답에 Location 헤더가 없습니다.
wsWebSocketContainer.missingWWWAuthenticateHeader=HTTP 응답 코드 [{0}]을(를) 처리하지
못했습니다. 응답 헤더 WWW-Authenticate가 없습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a58e1a..4e28e49 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,10 @@
Remove unused i18n messages and associated translations. Patch provided
by KangZhiDong. (markt)
+
+Expand the coverage and quality of the Korean translations provided
+with Apache Tomcat. (woonsan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/07: Clean-up Spansih translations
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 39a642b3007817e2361afd11bb216f2da7d14620
Author: Mark Thomas
AuthorDate: Wed Sep 11 12:11:25 2019 +0100
Clean-up Spansih translations
---
java/org/apache/catalina/manager/LocalStrings_es.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_es.properties | 1 -
java/org/apache/jasper/resources/LocalStrings_es.properties | 4 +---
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 6eec8dd..28c7e72 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -100,6 +100,7 @@ managerServlet.postCommand=FALLO - Intenté usar el comando
[{0}] vía un requer
managerServlet.reloaded=OK - Recargada aplicación en trayectoria de contexto
[{0}]
managerServlet.resourcesAll=OK - Listados recursos globales de todos los tipos
managerServlet.resourcesType=OK - Listados recursos globales de tipo [{0}]
+managerServlet.saveFail=FAIL - Fallo al guardar la configuración: [{0}]
managerServlet.saved=OK - Configuración de Servidor guardada
managerServlet.savedContext=OK - Configuración de Contexto [{0}] guardada
managerServlet.sessiondefaultmax=Intervalo máximo por defecto de sesión
inactiva [{0}] minutos
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties
b/java/org/apache/catalina/startup/LocalStrings_es.properties
index 61b7529..7afffab 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -43,7 +43,6 @@ contextConfig.init=ContextConfig: Inicializando
contextConfig.inputStreamFile=No puedo procesar el fichero [{0}] para las
anotaciones
contextConfig.inputStreamJar=No puedo procesar la entrada de Jar [{0}] desde
el Jar [{1}] para las anotaciones
contextConfig.inputStreamWebResource=Imposible procesar el recurso web [{0}]
para anotaciones
-contextConfig.invalidSci=No se pudo crear el ServletContentInitializer [{0}]
contextConfig.invalidSciHandlesTypes=No puedo cargar la clase [{0}] para
revisar contra la anotación @HandlesTypes de uno o más
ServletContentInitializers.
contextConfig.jspFile.error=El archivo JSP [{0}] debe de comenzar con ''/''
contextConfig.jspFile.warning=AVISO: El archivo JSP [{0}] debe de comenzar con
''/'' en Servlet 2.4
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 2c07f58..c7c470b 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -156,13 +156,11 @@ jsp.error.params.emptyBody=jsp:params debe de contener al
menos un jsp:param ani
jsp.error.params.invalidUse=jsp:params debe de ser un hijo directo de
jsp:plugin
jsp.error.parse.error.in.TLD=Error de análisis en el descriptor de biblioteca
de tags: [{0}]
jsp.error.parse.xml=Error de análisis XML en archivo [{0}]
-jsp.error.parse.xml.invalidPublicId=PUBLIC ID incorrecta: [{0}]
jsp.error.parse.xml.line=Error de análisis XML en archivo [{0}]: (línea [{1}],
col [{2}])
jsp.error.parse.xml.scripting.invalid.body=El cuerpo de elemento [{0}] no debe
de contener elementos XML
jsp.error.plugin.badtype=Valor ilegal para atributo 'type' en jsp:plugin: debe
de ser 'bean' o 'applet'
jsp.error.plugin.nocode=Código no declarado en jsp:plugin
jsp.error.plugin.notype=Tipo no declarado en jsp:plugin
-jsp.error.plugin.wrongRootElement=El nombre del elemento raíz en [{0}] difiere
de [{1}]
jsp.error.prefix.refined=Intento de redefinir el prefijo [{0}] por [{1}],
cuando ya estaba definido como [{2}] en el ámbito en curso.
jsp.error.prefix.use_before_dcl=El prefijo [{0}] especificado en esta
directiva de marca ha sido usado previamente mediante un fichero de acción
[{1}] línea [{2}].
jsp.error.prolog_config_encoding_mismatch=El Page-encoding especificado en XML
prolog [{0}] difiere del especificado en jsp-property-group [{1}]
@@ -338,4 +336,4 @@ Creado automaticamente mediante Apache Tomcat JspC.\n\
-->\n\
\n
-org.apache.jasper.compiler.TldCache.servletContextNull=El contenido
proporcionado para ServletContext tiene un valor nulo
\ No newline at end of file
+org.apache.jasper.compiler.TldCache.servletContextNull=El contenido
proporcionado para ServletContext tiene un valor nulo
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 17/20: Fix typo
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 39009826400fe1ca6d2dece7944997b92a5a79a7 Author: 康智冬 AuthorDate: Wed Sep 11 09:05:04 2019 +0800 Fix typo remove extra ‘a’ --- java/org/apache/catalina/util/SessionIdGeneratorBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/util/SessionIdGeneratorBase.java b/java/org/apache/catalina/util/SessionIdGeneratorBase.java index ca3d636..c0a2a2f 100644 --- a/java/org/apache/catalina/util/SessionIdGeneratorBase.java +++ b/java/org/apache/catalina/util/SessionIdGeneratorBase.java @@ -44,7 +44,7 @@ public abstract class SessionIdGeneratorBase extends LifecycleBase * identifiers. If the queue is empty when a random number generator is * required, a new random number generator object is created. This is * designed this way since random number generators use a sync to make them - * thread-safe and the sync makes using a a single object slow(er). + * thread-safe and the sync makes using a single object slow(er). */ private final Queue randoms = new ConcurrentLinkedQueue<>(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 15/20: fix typo
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 57f9a8614f5834290cc79ab75a739132026437a3
Author: KangZhiDong
AuthorDate: Wed Sep 4 22:51:13 2019 +0800
fix typo
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 88bfbb2..943c598 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -52,7 +52,7 @@ public class SSLHostConfig implements Serializable {
protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
static {
-/* Default used if protocols is not configured, also used if
+/* Default used if protocols are not configured, also used if
* protocols="All"
*/
SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_SSLv2Hello);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/20: fix typo,add doc
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 744a5cc8dcbf1f7286115967f1213a915829782a Author: kangzhidong AuthorDate: Sun Aug 25 02:15:39 2019 +0800 fix typo,add doc --- webapps/docs/cdi.xml | 2 +- webapps/docs/index.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml index 41da951..e9cea2c 100644 --- a/webapps/docs/cdi.xml +++ b/webapps/docs/cdi.xml @@ -54,7 +54,7 @@ The process to build CDI support is the following. - The resulting JAR at target/tomcat-owb-x.y.z.jar (where x.y.z depends on the diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml index 896d7ba..007f607 100644 --- a/webapps/docs/index.xml +++ b/webapps/docs/index.xml @@ -141,7 +141,8 @@ Apache Tomcat, and using many of the Apache Tomcat features. Developing WebSocket applications for Apache Tomcat. URL rewrite - Using the regexp based rewrite valve for conditional URL and host rewrite. - +CDI and JAX-RS support - +Configuring CDI,JAX-RS and Eclipse Microprofile support. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 13/20: Fix typo
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 bee83ad4b6993f8933ef7cb8883fd2f1c37a3536
Author: 康智冬
AuthorDate: Tue Sep 3 21:48:48 2019 +0800
Fix typo
fix typo
---
java/org/apache/coyote/ajp/Constants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index 2fb6c34..245404b 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -84,7 +84,7 @@ public final class Constants {
// Ajp13 specific - needs refactoring for the new model
/**
- * Default maximum total byte size for a AJP packet
+ * Default maximum total byte size for an AJP packet
*/
public static final int MAX_PACKET_SIZE = 8192;
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 20/20: Update changelog for PR from KangZhiDong
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 30f147154625f1ef6912152dc1a2b9011f6c00c6 Author: Mark Thomas AuthorDate: Wed Sep 11 11:50:44 2019 +0100 Update changelog for PR from KangZhiDong --- webapps/docs/changelog.xml | 8 1 file changed, 8 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4eedf0f..1405dbf 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,6 +122,10 @@ manifest entries for the Tomcat provided JARs included in the Tomcat embedded distribution. (markt) + +Fix a large number of Javadoc and documentation typos. Patch provided by +KangZhiDong. (markt) + @@ -158,6 +162,10 @@ the registry entires are added to the 64-bit registry when using a 64-bit JVM. (markt) + +Remove unused i18n messages and associated translations. Patch provided +by KangZhiDong. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/20: fix typo
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 a6a17a9cc08024f5178a7befb8578ac7a4e20699 Author: kangzhidong AuthorDate: Wed Aug 21 23:59:54 2019 +0800 fix typo --- java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java| 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java| 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- java/org/apache/tomcat/util/modeler/package.html| 2 +- webapps/docs/mbeans-descriptors-howto.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java index a538ea6..5f1bc83 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java @@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException; * * Examples: * - * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property IDataSender.9025.nrOfRequests + * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property IDataSender.9025.nrOfRequests * * * jmx:get diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index c81e9d0..74f2201 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException; * * * Examples: - * Set a Mbean Manager attribute maxActiveSessions. + * Set an Mbean Manager attribute maxActiveSessions. * Set this attribute with fresh jmx connection without save reference * * diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java index 62f1728..ba1ac1e 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java @@ -22,7 +22,7 @@ import javax.management.ObjectName; import org.apache.tools.ant.BuildException; /** - * unregister a MBean at JMX JSR 160 MBeans Server. + * unregister an MBean at JMX JSR 160 MBeans Server. * * unregister Mbeans * diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html index 5ac9683..6a49fc4 100644 --- a/java/org/apache/catalina/ant/jmx/package.html +++ b/java/org/apache/catalina/ant/jmx/package.html @@ -41,13 +41,13 @@ existing one. The following attribute are exists in every tasks: username - The username of a MBeanServer auth, when configured. + The username of an MBeanServer auth, when configured. password - The password of a MBeanServer auth, when configured. + The password of an MBeanServer auth, when configured. diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html index a64f08a..c60fb52 100644 --- a/java/org/apache/tomcat/util/modeler/package.html +++ b/java/org/apache/tomcat/util/modeler/package.html @@ -215,7 +215,7 @@ registry metadata by hand, using the addManagedBean() and the standard support for loading a configuration file to be convenient and sufficient. -Modeler will also look for a mbeans-descriptors.xml in the same package +Modeler will also look for an mbeans-descriptors.xml in the same package with the class being registered and in its parent. If no metadata is found, modeler will use a number of simple patterns, similar with the ones used by ant, to determine a reasonable metadata diff --git a/webapps/docs/mbeans-descriptors-howto.xml b/webapps/docs/mbeans-descriptors-howto.xml index a32e4f5..d9a7be2 100644 --- a/webapps/docs/mbeans-descriptors-howto.xml +++ b/webapps/docs/mbeans-descriptors-howto.xml @@ -49,7 +49,7 @@ in order to avoid a "ManagedBean is not found" exception. You may also add MBean descriptions for custom components in -a mbeans-descriptors.xml file, located in the same package as the class files +an mbeans-descriptors.xml file, located in the same package as the class files it describes. The permitted syntax for the mbeans-descriptors.xml is defined by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 12/20: Fix typo
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 91fc5fc7529bc50ee46b2140465474d6a5eddbfb
Author: 康智冬
AuthorDate: Mon Sep 2 20:41:45 2019 +0800
Fix typo
---
java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
index 398acfe..1851634 100644
--- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
@@ -70,7 +70,7 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
* Protect against the memory leak caused when the first call to
* sun.awt.AppContext.getAppContext() is triggered by a web
* application. Defaults to false since Tomcat code no longer
- * triggers this althoguh application code may.
+ * triggers this although application code may.
*/
private boolean appContextProtection = false;
public boolean isAppContextProtection() { return appContextProtection; }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 10/20: fix typo
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 de52b16fe5a925befc469072268962afdc2e040c
Author: KangZhiDong
AuthorDate: Sun Sep 1 03:34:01 2019 +0800
fix typo
---
java/javax/servlet/http/HttpServletRequest.java | 2 +-
java/org/apache/jasper/compiler/JspConfig.java| 2 +-
java/org/apache/tomcat/util/digester/package.html | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/javax/servlet/http/HttpServletRequest.java
b/java/javax/servlet/http/HttpServletRequest.java
index 6cc782e..872b9b8 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -353,7 +353,7 @@ public interface HttpServletRequest extends ServletRequest {
* /xyz
*
*
- * To reconstruct an URL with a scheme and host, use
+ * To reconstruct a URL with a scheme and host, use
* {@link #getRequestURL}.
*
* @return a String containing the part of the URL from the
diff --git a/java/org/apache/jasper/compiler/JspConfig.java
b/java/org/apache/jasper/compiler/JspConfig.java
index 493c8fb..373db7c 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -377,7 +377,7 @@ public class JspConfig {
}
/**
- * To find out if an uri matches an url pattern in jsp config. If so,
+ * To find out if a uri matches a url pattern in jsp config. If so,
* then the uri is a JSP page. This is used primarily for jspc.
* @param uri The path to check
* @return true if the path denotes a JSP page
diff --git a/java/org/apache/tomcat/util/digester/package.html
b/java/org/apache/tomcat/util/digester/package.html
index 0a16423..4438ac5 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -1008,9 +1008,9 @@ The public-identifier is an
additional free identifier whi
In practice, the weakness with a system-identifier is
that most parsers
-will attempt to interpret this URI as an URL, try to download the resource
directly
+will attempt to interpret this URI as a URL, try to download the resource
directly
from the URL and stop the parsing if this download fails. So, this means that
-almost always the URI will have to be an URL from which the declaration
+almost always the URI will have to be a URL from which the declaration
can be downloaded.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 19/20: Add link to newly added JASPIC docs
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 ea41568900c0d82739e4224f568065402560eeb2
Author: Mark Thomas
AuthorDate: Wed Sep 11 11:46:07 2019 +0100
Add link to newly added JASPIC docs
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 09eea02..ab00dc2 100644
--- a/build.xml
+++ b/build.xml
@@ -1969,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
+
https://docs.oracle.com/javase/8/docs/api/"/>
https://javaee.github.io/javaee-spec/javadocs/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/20: fix typo
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 9aa02209c9d0b3fa56c7bd96dd918cea9e229806
Author: kangzhidong
AuthorDate: Sun Aug 25 00:12:22 2019 +0800
fix typo
---
java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java | 2 +-
java/org/apache/tomcat/util/descriptor/tld/TldParser.java | 2 +-
webapps/docs/architecture/startup/serverStartup.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
index 74eab8c..dde2d37 100644
--- a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
@@ -61,7 +61,7 @@ public class TagPluginParser {
if (!handler.getWarnings().isEmpty() ||
!handler.getErrors().isEmpty()) {
handler.logFindings(log, source.getSystemId());
if (!handler.getErrors().isEmpty()) {
-// throw the first to indicate there was a error during
processing
+// throw the first to indicate there was an error during
processing
throw handler.getErrors().iterator().next();
}
}
diff --git a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
index 1c59516..e31c2fe 100644
--- a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
@@ -77,7 +77,7 @@ public class TldParser {
if (!handler.getWarnings().isEmpty() ||
!handler.getErrors().isEmpty()) {
handler.logFindings(log, source.getSystemId());
if (!handler.getErrors().isEmpty()) {
-// throw the first to indicate there was a error during
processing
+// throw the first to indicate there was an error during
processing
throw handler.getErrors().iterator().next();
}
}
diff --git a/webapps/docs/architecture/startup/serverStartup.txt
b/webapps/docs/architecture/startup/serverStartup.txt
index 716c8d0..c7c8c0d 100644
--- a/webapps/docs/architecture/startup/serverStartup.txt
+++ b/webapps/docs/architecture/startup/serverStartup.txt
@@ -77,7 +77,7 @@ What it does:
c2) Starts the services under which are:
StandardService -> starts Engine (ContainerBase -> Realm,Cluster
etc)
c3) StandardHost (started by the service)
-Configures a ErrorReportValvem to do proper HTML output for
different HTTP
+Configures an ErrorReportValve to do proper HTML output for
different HTTP
errors codes
Starts the Valves in the pipeline (at least the
ErrorReportValve)
Configures the StandardHostValve,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/20: remove unnecessary 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
commit 27f469855d623c3420f18e15d88faf747247b8e6
Author: 康智冬
AuthorDate: Sat Aug 24 18:33:27 2019 +0800
remove unnecessary code
---
java/org/apache/catalina/startup/ContextConfig.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index 6b6928a..75a16db 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -640,7 +640,6 @@ public class ContextConfig implements LifecycleListener {
docBaseAbsolute = ExpandWar.expand(host, war,
pathName);
docBaseAbsoluteFile = new File(docBaseAbsolute);
} else {
-docBaseAbsolute =
docBaseAbsoluteFileWar.getAbsolutePath();
docBaseAbsoluteFile = docBaseAbsoluteFileWar;
ExpandWar.validate(host, war, pathName);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 11/20: fix typo
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 7b1ec4706df1b2b7bd510a7c981c5110802631b2
Author: KangZhiDong
AuthorDate: Sun Sep 1 04:21:45 2019 +0800
fix typo
---
java/javax/servlet/http/PushBuilder.java | 4 ++--
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/javax/servlet/resources/web-common_3_0.xsd | 2 +-
java/javax/servlet/resources/web-common_3_1.xsd | 2 +-
java/javax/servlet/resources/web-common_4_0.xsd | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
java/org/apache/catalina/filters/LocalStrings.properties | 4 ++--
java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++--
java/org/apache/tomcat/util/http/parser/Host.java | 4 ++--
java/org/apache/tomcat/util/http/parser/MediaType.java| 2 +-
java/org/apache/tomcat/websocket/server/UpgradeUtil.java | 2 +-
test/org/apache/catalina/valves/rewrite/TestRewriteValve.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/connectors.xml | 2 +-
webapps/docs/rewrite.xml | 6 +++---
webapps/docs/ssl-howto.xml| 8
19 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/javax/servlet/http/PushBuilder.java
b/java/javax/servlet/http/PushBuilder.java
index fc63a47..e2a2430 100644
--- a/java/javax/servlet/http/PushBuilder.java
+++ b/java/javax/servlet/http/PushBuilder.java
@@ -84,7 +84,7 @@ public interface PushBuilder {
PushBuilder sessionId(String sessionId);
/**
- * Sets a HTTP header on the request. Any existing headers of the same name
+ * Sets an HTTP header on the request. Any existing headers of the same
name
* are first remove.
*
* @param name The name of the header to set
@@ -95,7 +95,7 @@ public interface PushBuilder {
PushBuilder setHeader(String name, String value);
/**
- * Adds a HTTP header to the request.
+ * Adds an HTTP header to the request.
*
* @param name The name of the header to add
* @param value The value of the header to add
diff --git a/java/javax/servlet/resources/web-app_2_5.xsd
b/java/javax/servlet/resources/web-app_2_5.xsd
index f01830f..72a0f6a 100644
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd
b/java/javax/servlet/resources/web-common_3_0.xsd
index 8382e3e..6d5d875 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -593,7 +593,7 @@
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/javax/servlet/resources/web-common_3_1.xsd
b/java/javax/servlet/resources/web-common_3_1.xsd
index fc0529b..c006c3b 100644
--- a/java/javax/servlet/resources/web-common_3_1.xsd
+++ b/java/javax/servlet/resources/web-common_3_1.xsd
@@ -566,7 +566,7 @@
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/javax/servlet/resources/web-common_4_0.xsd
b/java/javax/servlet/resources/web-common_4_0.xsd
index 0905460..72dfb41 100644
--- a/java/javax/servlet/resources/web-common_4_0.xsd
+++ b/java/javax/servlet/resources/web-common_4_0.xsd
@@ -566,7 +566,7 @@
-A HTTP method type as defined in HTTP 1.1 section 2.2.
+An HTTP method type as defined in HTTP 1.1 section 2.2.
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 4db1f87..ad5a1f4 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1048,7 +1048,7 @@ public class CorsFilter extends GenericFilter {
*/
SIMPLE,
/**
- * A HTTP request that needs to be pre-flighted.
+ * An HTTP request that needs to be pre-flighted.
*/
ACTUAL,
[tomcat] 18/20: Fix typo
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 692ae29f9f6479a630332638571c714a9637ab15 Author: 康智冬 AuthorDate: Wed Sep 11 10:13:46 2019 +0800 Fix typo add missing javadoc --- java/org/apache/catalina/ha/session/BackupManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java index 9533fe2..441eaa5 100644 --- a/java/org/apache/catalina/ha/session/BackupManager.java +++ b/java/org/apache/catalina/ha/session/BackupManager.java @@ -53,7 +53,7 @@ public class BackupManager extends ClusterManagerBase protected String name; /** - * + * Flag for how this map sends messages. */ private int mapSendOptions = Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/20: fix typo
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 98683a7338847fd6f11b3f604672ad5280e1499c Author: 康智冬 AuthorDate: Sat Aug 24 23:30:23 2019 +0800 fix typo fix typo --- webapps/docs/funcspecs/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/funcspecs/index.xml b/webapps/docs/funcspecs/index.xml index 953833c..e754c8a 100644 --- a/webapps/docs/funcspecs/index.xml +++ b/webapps/docs/funcspecs/index.xml @@ -59,7 +59,7 @@ still useful, because it provides an introduction to what Catalina does, without being as concerned with how this is accomplished. -TODO - Obviously, this area has a long ways to go before +TODO - Obviously, this area has a long way to go before it is complete. Contributions are welcome! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/20: fix typo
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 06ea9f7c8eab03073f23c4e6f0aa5c71cef0dccc
Author: kangzhidong
AuthorDate: Sat Aug 24 23:41:25 2019 +0800
fix typo
---
java/org/apache/jasper/compiler/ELFunctionMapper.java | 2 +-
java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java | 4 ++--
java/org/apache/tomcat/util/modeler/Registry.java | 2 +-
java/org/apache/tomcat/util/modeler/RegistryMBean.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java
b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index 2cb9e8a..f4f01e0 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -296,7 +296,7 @@ public class ELFunctionMapper {
}
/*
- * @return An unique name for a function mapper.
+ * @return A unique name for a function mapper.
*/
private String getMapName() {
return "_jspx_fnmap_" + currFunc++;
diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
index 16ea265..03159ea 100644
--- a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
+++ b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
@@ -37,7 +37,7 @@ public interface TagPluginContext {
boolean isAttributeSpecified(String attribute);
/**
- * @return An unique temporary variable name that the plugin can use.
+ * @return A unique temporary variable name that the plugin can use.
*/
String getTemporaryVariableName();
@@ -50,7 +50,7 @@ public interface TagPluginContext {
/**
* Generate a declaration in the of the generated class. This can be
* used to declare an inner class, a method, or a class variable.
- * @param id An unique ID identifying the declaration. It is not
+ * @param id A unique ID identifying the declaration. It is not
* part of the declaration, and is used to ensure that the
* declaration will only appear once. If this method is
* invoked with the same id more than once in the translation
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 6ee1393..fbf44e7 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -272,7 +272,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
*
* @param domain Namespace
* @param name Type of the notification
- * @return An unique id for the domain:name combination
+ * @return A unique id for the domain:name combination
* @since 1.1
*/
@Override
diff --git a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
index 17317ea..dd2debf 100644
--- a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
+++ b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
@@ -103,7 +103,7 @@ public interface RegistryMBean {
*
* @param domain Namespace
* @param name Type of the notification
- * @return An unique id for the domain:name combination
+ * @return A unique id for the domain:name combination
* @since 1.1
*/
public int getId(String domain, String name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/20: add JASPIC 1.1 Javadoc
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 2b94ec8c2c395cbbbd672300296bd2117bfab9f4
Author: kangzhidong
AuthorDate: Sun Aug 25 02:52:03 2019 +0800
add JASPIC 1.1 Javadoc
---
build.xml | 20
webapps/docs/jaspicapi/index.html | 34 ++
webapps/docs/project.xml | 1 +
3 files changed, 55 insertions(+)
diff --git a/build.xml b/build.xml
index 2c089e8..09eea02 100644
--- a/build.xml
+++ b/build.xml
@@ -1926,6 +1926,26 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
+
+
+
+
+
+
http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+
+
+API docs
+
+
+
+
+The JASPIC Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/;>
+documentation bundle.
+
+
+
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index f11ffc0..0fc55bc 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -86,6 +86,7 @@
+
https://tomcat.apache.org/connectors-doc/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 16/20: fix typo(an sql)
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 cad93e885ab5526a44c91832b7c4d0c5dca7bab2
Author: KangZhiDong
AuthorDate: Fri Sep 6 22:53:51 2019 +0800
fix typo(an sql)
---
java/org/apache/catalina/realm/JDBCRealm.java | 6 +++---
java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java | 4 ++--
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java| 4 ++--
.../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java| 2 +-
.../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml| 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/realm/JDBCRealm.java
b/java/org/apache/catalina/realm/JDBCRealm.java
index 2f11177..f27d9ac 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -306,7 +306,7 @@ public class JDBCRealm
// This needs rewritten with better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
@@ -509,7 +509,7 @@ public class JDBCRealm
// This needs rewritten with better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
@@ -581,7 +581,7 @@ public class JDBCRealm
// This needs rewritten wuth better pooling support, the existing code
// needs signature changes since the Prepared statements needs cached
// with the connections.
-// The code below will try twice if there is a SQLException so the
+// The code below will try twice if there is an SQLException so the
// connection may try to be opened again. On normal conditions
(including
// invalid login - the above is only used once.
int numberOfTries = 2;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
index eb0d09d..0cb852a 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
@@ -415,7 +415,7 @@ public class Jdbc41Bridge {
* Delegates to {@link Statement#closeOnCompletion()} without throwing a
{@link AbstractMethodError}.
*
* If the JDBC driver does not implement {@link
Statement#closeOnCompletion()}, then just check that the connection
- * is closed to then throw a SQLException.
+ * is closed to then throw an SQLException.
*
*
* @param statement
@@ -438,7 +438,7 @@ public class Jdbc41Bridge {
* Delegates to {@link Statement#isCloseOnCompletion()} without throwing a
{@link AbstractMethodError}.
*
* If the JDBC driver does not implement {@link
Statement#isCloseOnCompletion()}, then just check that the
- * connection is closed to then throw a SQLException.
+ * connection is closed to then throw an SQLException.
*
*
* @param statement
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
index 6f24f04..3f8d1af 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
import java.util.List;
/**
- * A SQLException based on a list of Throwable causes.
+ * An SQLException based on a list of Throwable causes.
*
* The first exception in the list is used as this exception's cause and is
accessible with the usual
* {@link #getCause()} while the complete list is accessible with {@link
#getCauseList()}.
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
index 1c6dee2..d5e176a 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
+++
[tomcat] 09/20: Fix typo
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 9b7d425687d152eabc5dbae30d3c6c195f384a44
Author: 康智冬
AuthorDate: Sat Aug 31 16:52:30 2019 +0800
Fix typo
---
java/org/apache/catalina/connector/Request.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 367a78b..61dea52 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -284,7 +284,7 @@ public class Request implements HttpServletRequest {
/**
- * Using writer flag.
+ * Using reader flag.
*/
protected boolean usingReader = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 14/20: fix typo (an ssl)
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 28788f02ae5059fc1a2915b53b40fdb6ceeb6169 Author: KangZhiDong AuthorDate: Wed Sep 4 22:48:23 2019 +0800 fix typo (an ssl) --- conf/server.xml | 4 ++-- java/org/apache/catalina/realm/LocalStrings.properties | 2 +- java/org/apache/catalina/startup/CertificateCreateRule.java | 2 +- java/org/apache/tomcat/jni/SSL.java | 6 +++--- java/org/apache/tomcat/jni/SSLConf.java | 2 +- java/org/apache/tomcat/jni/SSLContext.java | 6 +++--- java/org/apache/tomcat/jni/SSLSocket.java | 6 +++--- java/org/apache/tomcat/util/net/Nio2Channel.java| 2 +- java/org/apache/tomcat/util/net/NioChannel.java | 2 +- java/org/apache/tomcat/util/net/SecureNio2Channel.java | 2 +- java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +- webapps/docs/changelog.xml | 2 +- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/http.xml| 2 +- webapps/docs/ssl-howto.xml | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/conf/server.xml b/conf/server.xml index fce8922..2cd78df 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -76,7 +76,7 @@ connectionTimeout="2" redirectPort="8443" /> --> - -
[tomcat] branch master updated (4d8ce2c -> 30f1471)
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 4d8ce2c Polish. Spacing. new a6a17a9 fix typo new 27f4698 remove unnecessary code new 98683a7 fix typo new 06ea9f7 fix typo new 9aa0220 fix typo new 744a5cc fix typo,add doc new 2b94ec8 add JASPIC 1.1 Javadoc new 0bb11f5 Remove all unused terms carefully for clean,for example “org.apache.jasper.servlet.TldScanner.webxmlSkip、webxmlFailPathDoesNotExist、webxmlSkip” are joined by other String new 9b7d425 Fix typo new de52b16 fix typo new 7b1ec47 fix typo new 91fc5fc Fix typo new bee83ad Fix typo new 28788f0 fix typo (an ssl) new 57f9a86 fix typo new cad93e8 fix typo(an sql) new 3900982 Fix typo new 692ae29 Fix typo new ea41568 Add link to newly added JASPIC docs new 30f1471 Update changelog for PR from KangZhiDong The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 21 + conf/server.xml | 4 ++-- java/javax/servlet/http/HttpServletRequest.java | 2 +- java/javax/servlet/http/PushBuilder.java| 4 ++-- java/javax/servlet/resources/web-app_2_5.xsd| 2 +- java/javax/servlet/resources/web-common_3_0.xsd | 2 +- java/javax/servlet/resources/web-common_3_1.xsd | 2 +- java/javax/servlet/resources/web-common_4_0.xsd | 2 +- .../apache/catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- .../apache/catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- .../catalina/connector/LocalStrings.properties | 1 - .../catalina/connector/LocalStrings_cs.properties | 1 - .../catalina/connector/LocalStrings_de.properties | 1 - .../catalina/connector/LocalStrings_es.properties | 1 - .../catalina/connector/LocalStrings_fr.properties | 1 - .../catalina/connector/LocalStrings_ja.properties | 1 - .../catalina/connector/LocalStrings_ko.properties | 1 - .../catalina/connector/LocalStrings_ru.properties | 1 - .../connector/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/connector/Request.java | 2 +- .../core/JreMemoryLeakPreventionListener.java | 2 +- .../apache/catalina/core/LocalStrings.properties| 4 .../apache/catalina/core/LocalStrings_cs.properties | 1 - .../apache/catalina/core/LocalStrings_de.properties | 1 - .../apache/catalina/core/LocalStrings_es.properties | 4 .../apache/catalina/core/LocalStrings_fr.properties | 4 .../apache/catalina/core/LocalStrings_ja.properties | 4 .../apache/catalina/core/LocalStrings_ko.properties | 4 .../catalina/core/LocalStrings_zh_CN.properties | 2 -- java/org/apache/catalina/filters/CorsFilter.java| 2 +- .../apache/catalina/filters/LocalStrings.properties | 4 ++-- .../apache/catalina/ha/session/BackupManager.java | 2 +- .../apache/catalina/loader/LocalStrings.properties | 9 - .../catalina/loader/LocalStrings_cs.properties | 2 -- .../catalina/loader/LocalStrings_de.properties | 3 +-- .../catalina/loader/LocalStrings_es.properties | 8 .../catalina/loader/LocalStrings_fr.properties | 9 - .../catalina/loader/LocalStrings_ja.properties | 9 - .../catalina/loader/LocalStrings_ko.properties | 9 - .../catalina/loader/LocalStrings_pt_BR.properties | 1 - .../catalina/loader/LocalStrings_zh_CN.properties | 5 - .../apache/catalina/manager/LocalStrings.properties | 2 -- .../catalina/manager/LocalStrings_de.properties | 1 - .../catalina/manager/LocalStrings_es.properties | 1 - .../catalina/manager/LocalStrings_fr.properties | 3 --- .../catalina/manager/LocalStrings_ja.properties | 1 - .../catalina/manager/LocalStrings_ko.properties | 1 - .../catalina/manager/LocalStrings_ru.properties | 2 -- .../catalina/manager/LocalStrings_zh_CN.properties | 3 --- .../catalina/manager/host/LocalStrings.properties | 1 - .../manager/host/LocalStrings_fr.properties | 1 - .../manager/host/LocalStrings_ja.properties | 1 - .../manager/host/LocalStrings_ko.properties | 1 - .../manager/host/LocalStrings_ru.properties | 1 - .../manager/host/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/realm/JDBCRealm.java | 6 +++--- .../apache/catalina/realm/LocalStrings.properties | 4 +--- .../catalina/realm/LocalStrings_cs.properties | 1 -
[GitHub] [tomcat] markt-asf commented on a change in pull request #194: fix typo
markt-asf commented on a change in pull request #194: fix typo URL: https://github.com/apache/tomcat/pull/194#discussion_r323170474 ## File path: webapps/docs/windows-auth-howto.xml ## @@ -101,7 +101,7 @@ policy had to be relaxed. This is not recommended for production environments. service class/host:port/service name. The SPN used in this how-to is HTTP/win-tc01.dev.local. To map the user to the SPN, run the following: - setspn -A HTTP/win-tc01.dev.local tc01 + setspn -An HTTP/win-tc01.dev.local tc01 Review comment: This change is incorrect. This is a command line option hence it needs to be `.. -A HTTP...` 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 With regards, Apache Git Services - 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 issue #194: fix typo
markt-asf commented on issue #194: fix typo URL: https://github.com/apache/tomcat/pull/194#issuecomment-530322410 I'm about 2/3 of the way through the commits. With the benefit of experience, 1 PR vs multiple PRs doesn't make that much of a difference. What would have helped was re-basing the PR against master. I've done this locally and there were only a couple of conflicts and it makes it much easier to review. I spotted a few unused i18n strings that weren't removed from the translations. That isn't a big deal as the process we use to import/export to/from POEditor will clean those up. I have spotted a couple of minor issues. I'll fix those before merging the commits. I'll also comment on the commit in this PR where it makes sense to do so. 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63739] Automatic-Module-Names in embedded jars are language-level invalid
https://bz.apache.org/bugzilla/show_bug.cgi?id=63739 --- Comment #2 from Rob --- Reviewed the commit, and it looks perfect to me. Thanks, that's really appreciated. -- 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 63685] WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685 --- Comment #3 from Andrei Ivanov --- I remember having a problem with AOP and load time weaving where Tomcat was scanning the WAR for servlet annotations and caching the classes so by the time the app was starting and LTW enabled, the classloader was returning the cached classes instead of passing them through the instrumentation agent, -- 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 61214] NoSuchMethodException in JMX Proxy when accessing to Context MBeans
https://bz.apache.org/bugzilla/show_bug.cgi?id=61214 --- Comment #5 from Mia Gray --- Bug zilla is the bug related and the bug maintaining structure with the legal and illegal factor of criteria building featuring. The bug report is mentioned here has the linkage of https://www.analyzedu.com/writing-services-reviews/edusson-com-review.html with the critical review of detailing the other type of the best services. -- 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
[GitHub] [tomcat] markt-asf commented on issue #194: fix typo
markt-asf commented on issue #194: fix typo URL: https://github.com/apache/tomcat/pull/194#issuecomment-530252907 Wow. There are a lot of changes here. Thank you. It is too much to review in one go. I took a quick look at the first few changes files and things look good. My current plan is to review these in detail commit by commit and cherry-pick each commit once it has been reviewed. I appreciate that some of these commits may depend on previous commits. That said, more PRs with fewer commits would be easier to work with where that is possible. 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59703] RFC 6265 Cookie Processor doesn't allow cookie domains with a leading dot.
https://bz.apache.org/bugzilla/show_bug.cgi?id=59703 --- Comment #5 from Jonathan --- Bugs are the error which presents the formation of the error for the kind of good and best fortune to all of the basic things. The cookies error and the password building have the link in https://www.topaperwritingservices.com/review-bestdisseration-com/ for best dissection way of fortune building by grant allowance. -- 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
