[tomcat] 01/02: Fix deprecation warnings with newer JUnit 4 in 2020.03 Eclipse IDE

[markt]

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 6e3a29d190baaf605347f8ce46fa62b11787c247
Author: Mark Thomas 
AuthorDate: Fri Mar 27 09:37:51 2020 +

Fix deprecation warnings with newer JUnit 4 in 2020.03 Eclipse IDE
---
 test/org/apache/catalina/core/TestStandardContext.java   | 3 ++-
 .../catalina/tribes/group/interceptors/TestEncryptInterceptor.java   | 3 ++-
 test/org/apache/coyote/http2/TestHttp2Limits.java| 5 +++--
 test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardContext.java 
b/test/org/apache/catalina/core/TestStandardContext.java
index c964909..490abd6 100644
--- a/test/org/apache/catalina/core/TestStandardContext.java
+++ b/test/org/apache/catalina/core/TestStandardContext.java
@@ -47,6 +47,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -985,7 +986,7 @@ public class TestStandardContext extends TomcatBaseTest {
 Context context = new StandardContext();
 
 context.setResourceOnlyServlets("a,b,c");
-
Assert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
+
MatcherAssert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
 CoreMatchers.hasItems("a", "b", "c"));
 }
 
diff --git 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
index 5b76df7..172ca20 100644
--- 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
+++ 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 
 import javax.crypto.Cipher;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
 
@@ -371,7 +372,7 @@ public class TestEncryptInterceptor {
 
 byte[] cipherText2 = 
((ValueCaptureInterceptor)src.getNext()).getValue();
 
-Assert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
+MatcherAssert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
 cipherText1, IsNot.not(IsEqual.equalTo(cipherText2)));
 }
 
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index d5f109f..a8f4458 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Random;
 
 import org.hamcrest.Description;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.TypeSafeMatcher;
 
 import org.junit.Assert;
@@ -265,7 +266,7 @@ public class TestHttp2Limits extends Http2TestBase {
 //   above.
 try {
 parser.readFrame(true);
-Assert.assertThat(output.getTrace(), RegexMatcher.matchesRegex(
+MatcherAssert.assertThat(output.getTrace(), 
RegexMatcher.matchesRegex(
 "0-Goaway-\\[1\\]-\\[11\\]-\\[" + limitMessage + 
"\\]"));
 } catch (IOException se) {
 // Expected on some platforms
@@ -505,7 +506,7 @@ public class TestHttp2Limits extends Http2TestBase {
 // the escaped values.
 String limitMessage = sm.getString("http2Parser.headerLimitSize", 
"\\d++", "3");
 limitMessage = limitMessage.replace("[", "\\[").replace("]", 
"\\]");
-Assert.assertThat(output.getTrace(), RegexMatcher.matchesRegex(
+MatcherAssert.assertThat(output.getTrace(), 
RegexMatcher.matchesRegex(
 "0-Goaway-\\[3\\]-\\[11\\]-\\[" + limitMessage + "\\]"));
 break;
 }
diff --git a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java 
b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
index 031d115..089bd3f 100644
--- a/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
+++ b/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
 import org.junit.Assert;
 import org.junit.Assume;
@@ -97,10 +98,10 @@ public class TestOpenSSLConf extends TomcatBaseTest {
 sslHostConfig = initOpenSSLConfCmd("CipherString", ENABLED_CIPHER);
 }
 String[] ciphers = sslHostConfig.getEnabledCiphers();
-Assert.assertThat("Wrong HostConfig ciphers", ciphers,
+MatcherAssert.assertThat("Wrong H

[tomcat] branch 8.5.x updated (bf094bb -> a09e897)

[markt]

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 bf094bb  Update chaneglog
 new 6e3a29d  Fix deprecation warnings with newer JUnit 4 in 2020.03 
Eclipse IDE
 new a09e897  Refactor to fix false positive leak warning in Eclipse 2020.03

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


Summary of changes:
 java/org/apache/catalina/valves/ErrorReportValve.java| 4 +++-
 test/org/apache/catalina/core/TestStandardContext.java   | 3 ++-
 .../catalina/tribes/group/interceptors/TestEncryptInterceptor.java   | 3 ++-
 test/org/apache/coyote/http2/TestHttp2Limits.java| 5 +++--
 test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java | 5 +++--
 5 files changed, 13 insertions(+), 7 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Refactor to fix false positive leak warning in Eclipse 2020.03

[markt]

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 a09e89703452693e3327a91bd5c2b96496e83fc0
Author: Mark Thomas 
AuthorDate: Fri Mar 27 22:28:05 2020 +

Refactor to fix false positive leak warning in Eclipse 2020.03
---
 java/org/apache/catalina/valves/ErrorReportValve.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java 
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 08ef2c7..c30ed15 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -165,7 +165,9 @@ public class ErrorReportValve extends ValveBase {
 if (throwable != null) {
 String exceptionMessage = throwable.getMessage();
 if (exceptionMessage != null && exceptionMessage.length() > 0) 
{
-message = Escape.htmlElementContent((new 
Scanner(exceptionMessage)).nextLine());
+try (Scanner scanner = new Scanner(exceptionMessage)) {
+message = 
Escape.htmlElementContent(scanner.nextLine());
+}
 }
 }
 if (message == null) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Refactor to silence some false positives leak warnings in Eclipse

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 06a756d  Refactor to silence some false positives leak warnings in 
Eclipse
06a756d is described below

commit 06a756dc46de76eccff02db13f1d753980a9e869
Author: Mark Thomas 
AuthorDate: Fri Mar 27 21:59:45 2020 +

Refactor to silence some false positives leak warnings in Eclipse
---
 java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java | 3 ++-
 java/org/apache/catalina/valves/ErrorReportValve.java | 4 +++-
 java/org/apache/tomcat/util/file/ConfigurationSource.java | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java 
b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
index 134b6a4..53fb91f 100644
--- a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
+++ b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
@@ -85,7 +85,8 @@ public class CatalinaBaseConfigurationSource implements 
ConfigurationSource {
 f = new File(catalinaBaseFile, name);
 }
 if (f.isFile()) {
-return new Resource(new FileInputStream(f), f.toURI());
+FileInputStream fis = new FileInputStream(f);
+return new Resource(fis, f.toURI());
 }
 
 // Try classloader
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java 
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 5c5c273..c8201e2 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -197,7 +197,9 @@ public class ErrorReportValve extends ValveBase {
 if (throwable != null) {
 String exceptionMessage = throwable.getMessage();
 if (exceptionMessage != null && exceptionMessage.length() > 0) 
{
-message = Escape.htmlElementContent((new 
Scanner(exceptionMessage)).nextLine());
+try (Scanner scanner = new Scanner(exceptionMessage)) {
+message = 
Escape.htmlElementContent(scanner.nextLine());
+}
 }
 }
 if (message == null) {
diff --git a/java/org/apache/tomcat/util/file/ConfigurationSource.java 
b/java/org/apache/tomcat/util/file/ConfigurationSource.java
index 38228f9..2df11bc 100644
--- a/java/org/apache/tomcat/util/file/ConfigurationSource.java
+++ b/java/org/apache/tomcat/util/file/ConfigurationSource.java
@@ -44,7 +44,8 @@ public interface ConfigurationSource {
 f = new File(userDir, name);
 }
 if (f.isFile()) {
-return new Resource(new FileInputStream(f), f.toURI());
+FileInputStream fis = new FileInputStream(f);
+return new Resource(fis, f.toURI());
 }
 URI uri = null;
 try {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Refactor to silence some false positives leak warnings in Eclipse

[Mark Thomas]

On 27/03/2020 22:00, ma...@apache.org wrote:
> 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 03f9d50  Refactor to silence some false positives leak warnings in 
> Eclipse
> 03f9d50 is described below
> 
> commit 03f9d50283b25c1dd3f371d2f0757ef036d726f7
> Author: Mark Thomas 
> AuthorDate: Fri Mar 27 21:59:45 2020 +
> 
> Refactor to silence some false positives leak warnings in Eclipse



> diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java 
> b/java/org/apache/catalina/valves/ErrorReportValve.java
> index 007f10f..b669ba2 100644
> --- a/java/org/apache/catalina/valves/ErrorReportValve.java
> +++ b/java/org/apache/catalina/valves/ErrorReportValve.java
> @@ -197,7 +197,9 @@ public class ErrorReportValve extends ValveBase {
>  if (throwable != null) {
>  String exceptionMessage = throwable.getMessage();
>  if (exceptionMessage != null && exceptionMessage.length() > 
> 0) {
> -message = Escape.htmlElementContent((new 
> Scanner(exceptionMessage)).nextLine());
> +try (Scanner scanner = new Scanner(exceptionMessage)) {
> +message = 
> Escape.htmlElementContent(scanner.nextLine());
> +}
>  }
>  }
>  if (message == null) {

Ideally the false positives would get fixed but irrespective of that I
don't mind the other fixes but this one I am less keen on.
Unfortunately, I can't see a better way of fixing it. I thought about
silencing the warning but that has to be at the method level and could
silence a genuine leak in a future commit. Overall this seemed like the
least bad option to get back to zero IDE errors.

And I do find zero IDE errors helpful as it means as soon as I see a
warning I know I've done something wring and can fix it.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Refactor to silence some false positives leak warnings in Eclipse

[markt]

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 03f9d50  Refactor to silence some false positives leak warnings in 
Eclipse
03f9d50 is described below

commit 03f9d50283b25c1dd3f371d2f0757ef036d726f7
Author: Mark Thomas 
AuthorDate: Fri Mar 27 21:59:45 2020 +

Refactor to silence some false positives leak warnings in Eclipse
---
 java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java | 3 ++-
 java/org/apache/catalina/valves/ErrorReportValve.java | 4 +++-
 java/org/apache/tomcat/util/file/ConfigurationSource.java | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java 
b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
index 134b6a4..53fb91f 100644
--- a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
+++ b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
@@ -85,7 +85,8 @@ public class CatalinaBaseConfigurationSource implements 
ConfigurationSource {
 f = new File(catalinaBaseFile, name);
 }
 if (f.isFile()) {
-return new Resource(new FileInputStream(f), f.toURI());
+FileInputStream fis = new FileInputStream(f);
+return new Resource(fis, f.toURI());
 }
 
 // Try classloader
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java 
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 007f10f..b669ba2 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -197,7 +197,9 @@ public class ErrorReportValve extends ValveBase {
 if (throwable != null) {
 String exceptionMessage = throwable.getMessage();
 if (exceptionMessage != null && exceptionMessage.length() > 0) 
{
-message = Escape.htmlElementContent((new 
Scanner(exceptionMessage)).nextLine());
+try (Scanner scanner = new Scanner(exceptionMessage)) {
+message = 
Escape.htmlElementContent(scanner.nextLine());
+}
 }
 }
 if (message == null) {
diff --git a/java/org/apache/tomcat/util/file/ConfigurationSource.java 
b/java/org/apache/tomcat/util/file/ConfigurationSource.java
index 38228f9..2df11bc 100644
--- a/java/org/apache/tomcat/util/file/ConfigurationSource.java
+++ b/java/org/apache/tomcat/util/file/ConfigurationSource.java
@@ -44,7 +44,8 @@ public interface ConfigurationSource {
 f = new File(userDir, name);
 }
 if (f.isFile()) {
-return new Resource(new FileInputStream(f), f.toURI());
+FileInputStream fis = new FileInputStream(f);
+return new Resource(fis, f.toURI());
 }
 URI uri = null;
 try {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

RE: Malicious Headers

[George Stanchev]

I find it quite surprising that you are worried about security for a version 
that is so old (latest Tomcat on the 7.0.x branch is 7.0.103). Proper security 
practices call for using latest versions where security issues might be 
resolved.

From: Victor Rodriguez 
Sent: Friday, March 27, 2020 11:55 AM
To: dev@tomcat.apache.org
Subject: Malicious Headers

We are using Fortify, which is a static code analysis tool to find 
vulnerabilities in your code and it's saying that code might be susceptible to 
malicious header injection, such as CRLF.  However, it also says that "Many of 
today's modern application servers will prevent the injection of malicious 
characters into HTTP headers. For example, recent versions of Apache Tomcat 
will throw an IllegalArgumentException if you attempt to set a header with 
prohibited characters. If your application server prevents setting headers with 
new line characters, then your application is not vulnerable to HTTP Response 
Splitting."

Does tomcat prevent the injection of malicious characters into HTTP headers?  
We are currently using Apache Tomcat/7.0.53.  Thanks!

--
Sent from neither my iPhone nor my iPad.

Re: Remaining Tomcat 10 items

[Rémy Maucherat]

On Fri, Mar 27, 2020 at 6:13 PM Mark Thomas  wrote:

> On 26/03/2020 16:47, Rémy Maucherat wrote:
> > On Mon, Mar 23, 2020 at 10:37 AM Rémy Maucherat  > > wrote:
> >
> > - Remove the use of system properties to control configuration
> > wherever possible.
> > I still don't see the point for quite a few of them. For others
> > however, using sys props was a mistake, example the facade
> > recycling. Also, the digester can now pull from system and env
> > properties, giving full flexibility. Also also, this is a handy way
> > to do things in cloud. I think we should target the ones which
> > should make sense.
> >
> >
> > I think I'm done with that area for now as I'm a bit skeptical about
> > this for JULI, EL, JSP and Websockets. Any reasonable candidates for
> > removal left ?
>
> Digester
>  - Not sure. Likely to be tricky
>

That sounds impossible since it happens before parsing of server.xml, so no
real way to configure besides system properties.


>
> Clustering
>  - org.apache.catalina.tribes.dns_lookups
>Any DNS names are going to *have* to be resolved at some point for
>the cluster to work. I'd probably remove this and let the user
>specify DNS name or IP address as they wish.
>

Ok. I think it's totally useless so I chose not to care about it ;)


>
> EL
>  - Can't do anything about these without spec changes
>
> Jasper
>  - Could all move to o.a.jasper.Options
>

Possibly yes. Quite a bit of work there.

>
> Security
>  - ALLOW_BACKSLASH
>Remove it. It is just wrong. If we must keep it, move it to the
>Connector.
>  - ALLOW_ENCODED_SLASH
>I plan to replace this with a Connector option
>

I moved both to the Connector already, they can be removed as needed.


>
> Spec
>  - STRICT_SERVLET_COMPLIANCE
>Is a useful short-cut
>

+1


>  - Move the remaining ones to the Context or related object where
>possible (I haven't checked how easy that would be)
>

I moved them to Context.


>
> Sessions
>  - Move to the Manager or related object where possible (I haven't
>checked how easy that would be)
>

I moved them to Manager.

>
> JULI
>  - Look tricky to remove any of these.
>
> JAR Scanning
>  - Leave as is
>
> WebSockets
>  - Ideally want to set these per web app but we'd need to find a
>configuration mechanism to use
>
> Other
>  - Looks like NioSelectorShared has already been refactored out.
>

Yes, I removed that one from the doc.


>  - The rest look difficult to remove.
>

Rémy


>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Malicious Headers

[Victor Rodriguez]

We are using Fortify, which is a static code analysis tool to find
vulnerabilities in your code and it's saying that code might be susceptible
to malicious header injection, such as CRLF.  However, it also says that
"Many of today's modern application servers will prevent the injection of
malicious characters into HTTP headers. For example, recent versions of
Apache Tomcat will throw an IllegalArgumentException if you attempt to set
a header with prohibited characters. If your application server prevents
setting headers with new line characters, then your application is not
vulnerable to HTTP Response Splitting."

Does tomcat prevent the injection of malicious characters into HTTP
headers?  We are currently using Apache Tomcat/7.0.53.  Thanks!

-- 
Sent from neither my iPhone nor my iPad.

[GitHub] [tomcat-native] michael-o commented on issue #7: BZ 64260: Clean up install target

[GitBox]

michael-o commented on issue #7: BZ 64260: Clean up install target
URL: https://github.com/apache/tomcat-native/pull/7#issuecomment-605156633
 
 
   > I will test this soon on Linux ARM64!
   
   Looking forward too.


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/02: Fix typo

[markt]

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 7517387b48b833cb25074471ca7dae9b6c7ddafd
Author: Mark Thomas 
AuthorDate: Fri Mar 27 16:12:05 2020 +

Fix typo
---
 test/org/apache/tomcat/util/buf/TestCharsetUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/buf/TestCharsetUtil.java 
b/test/org/apache/tomcat/util/buf/TestCharsetUtil.java
index b6b7790..ac996d1 100644
--- a/test/org/apache/tomcat/util/buf/TestCharsetUtil.java
+++ b/test/org/apache/tomcat/util/buf/TestCharsetUtil.java
@@ -44,7 +44,7 @@ public class TestCharsetUtil {
 
 
 /*
- * More comprehensive test that checks that, part from where the encoding
+ * More comprehensive test that checks that, apart from where the encoding
  * overlaps with ASCII, no valid ASCII bytes are used.
  */
 @Test


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (4c853d3 -> 157a131)

[markt]

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 4c853d3  getDeferAccept now returns false in AbstractEndpoint
 new 7517387  Fix typo
 new 157a131  Remove unnecessary setProperty() calls

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


Summary of changes:
 java/org/apache/catalina/connector/Connector.java| 11 ---
 test/org/apache/tomcat/util/buf/TestCharsetUtil.java |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Remove unnecessary setProperty() calls

[markt]

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 157a131665130e4fa2f4640a12bb7630481ce52e
Author: Mark Thomas 
AuthorDate: Fri Mar 27 17:18:12 2020 +

Remove unnecessary setProperty() calls
---
 java/org/apache/catalina/connector/Connector.java | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index ec65163..d78afff 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -393,7 +393,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setAllowTrace(boolean allowTrace) {
 this.allowTrace = allowTrace;
-setProperty("allowTrace", String.valueOf(allowTrace));
 }
 
 
@@ -450,7 +449,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setEnableLookups(boolean enableLookups) {
 this.enableLookups = enableLookups;
-setProperty("enableLookups", String.valueOf(enableLookups));
 }
 
 
@@ -501,7 +499,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setMaxParameterCount(int maxParameterCount) {
 this.maxParameterCount = maxParameterCount;
-setProperty("maxParameterCount", String.valueOf(maxParameterCount));
 }
 
 
@@ -523,7 +520,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setMaxPostSize(int maxPostSize) {
 this.maxPostSize = maxPostSize;
-setProperty("maxPostSize", String.valueOf(maxPostSize));
 }
 
 
@@ -577,7 +573,6 @@ public class Connector extends LifecycleMBeanBase  {
 
 this.parseBodyMethods = methods;
 this.parseBodyMethodsSet = methodSet;
-setProperty("parseBodyMethods", methods);
 }
 
 
@@ -713,7 +708,6 @@ public class Connector extends LifecycleMBeanBase  {
 } else {
 this.proxyName = null;
 }
-setProperty("proxyName", this.proxyName);
 }
 
 
@@ -732,7 +726,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setProxyPort(int proxyPort) {
 this.proxyPort = proxyPort;
-setProperty("proxyPort", String.valueOf(proxyPort));
 }
 
 
@@ -753,7 +746,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setRedirectPort(int redirectPort) {
 this.redirectPort = redirectPort;
-setProperty("redirectPort", String.valueOf(redirectPort));
 }
 
 
@@ -855,7 +847,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) {
 this.useBodyEncodingForURI = useBodyEncodingForURI;
-setProperty("useBodyEncodingForURI", 
String.valueOf(useBodyEncodingForURI));
 }
 
 /**
@@ -880,7 +871,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setXpoweredBy(boolean xpoweredBy) {
 this.xpoweredBy = xpoweredBy;
-setProperty("xpoweredBy", String.valueOf(xpoweredBy));
 }
 
 
@@ -892,7 +882,6 @@ public class Connector extends LifecycleMBeanBase  {
  */
 public void setUseIPVHosts(boolean useIPVHosts) {
 this.useIPVHosts = useIPVHosts;
-setProperty("useIPVHosts", String.valueOf(useIPVHosts));
 }
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Remaining Tomcat 10 items

[Mark Thomas]

On 26/03/2020 16:47, Rémy Maucherat wrote:
> On Mon, Mar 23, 2020 at 10:37 AM Rémy Maucherat  > wrote:
> 
> - Remove the use of system properties to control configuration
> wherever possible.
> I still don't see the point for quite a few of them. For others
> however, using sys props was a mistake, example the facade
> recycling. Also, the digester can now pull from system and env
> properties, giving full flexibility. Also also, this is a handy way
> to do things in cloud. I think we should target the ones which
> should make sense.
> 
> 
> I think I'm done with that area for now as I'm a bit skeptical about
> this for JULI, EL, JSP and Websockets. Any reasonable candidates for
> removal left ?

Digester
 - Not sure. Likely to be tricky

Clustering
 - org.apache.catalina.tribes.dns_lookups
   Any DNS names are going to *have* to be resolved at some point for
   the cluster to work. I'd probably remove this and let the user
   specify DNS name or IP address as they wish.

EL
 - Can't do anything about these without spec changes

Jasper
 - Could all move to o.a.jasper.Options

Security
 - ALLOW_BACKSLASH
   Remove it. It is just wrong. If we must keep it, move it to the
   Connector.
 - ALLOW_ENCODED_SLASH
   I plan to replace this with a Connector option

Spec
 - STRICT_SERVLET_COMPLIANCE
   Is a useful short-cut
 - Move the remaining ones to the Context or related object where
   possible (I haven't checked how easy that would be)

Sessions
 - Move to the Manager or related object where possible (I haven't
   checked how easy that would be)

JULI
 - Look tricky to remove any of these.

JAR Scanning
 - Leave as is

WebSockets
 - Ideally want to set these per web app but we'd need to find a
   configuration mechanism to use

Other
 - Looks like NioSelectorShared has already been refactored out.
 - The rest look difficult to remove.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Remaining Tomcat 10 items

[Mark Thomas]

On 27/03/2020 16:13, Rémy Maucherat wrote:
> On Fri, Mar 27, 2020 at 4:54 PM Mark Thomas  > wrote:
> 
> On 25/03/2020 13:43, Rémy Maucherat wrote:
> > On Mon, Mar 23, 2020 at 11:11 AM Mark Thomas  
> > >> wrote:
> >
> >     > - Reduce instances of setters and getters for the same property
> >     existing
> >     > on an object and its parent. This may require new objects to be
> >     exposed
> >     > via JMX.
> >     > Fixed enough ?
> >
> >     From memory, this was primarily on the Connectors. That is
> certainly a
> >     lot better. I'd like to review things before closing this one out.
> >
> >
> > There's indeed a problem on Connector, but I don't see how to fix it.
> >
> > Ex:
> >     public void setMaxPostSize(int maxPostSize) {
> >         this.maxPostSize = maxPostSize;
> >         setProperty("maxPostSize", String.valueOf(maxPostSize));
> >     }
> >
> > Both Catalina and Coyote need to access the value. The alternative
> would
> > be to have the Catalina code use getProperty, which would be both
> uglier
> > and slower.
> 
> I don't see any use of that particular property in Coyote. I think the
> setProperty() call can be removed.
> 
> 
> :D
> Grep confirms that we can remove the setProperty. Ok, that was a
> horrible example, but a few others in Connector are useful in both (like
> maxSavePostSize, which is one I looked at, then I wrote the post talking
> about maxPostSize).

The ones we need to keep are (I think):

asyncTimeout
maxSavePostSize
port
portOffset
localPort
secure

In terms of simplification, we could leave them as is or:
- Add them to ProtocolHandler
- Refactor Connector to pass the getter/setter calls to the
  ProtocolHandler instance.

I'm currently running a set of unit tests with the other setProperty()
calls removed to confirm I haven't missed anything.

I haven't looked elsewhere yet.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Remaining Tomcat 10 items

[Rémy Maucherat]

On Fri, Mar 27, 2020 at 4:54 PM Mark Thomas  wrote:

> On 25/03/2020 13:43, Rémy Maucherat wrote:
> > On Mon, Mar 23, 2020 at 11:11 AM Mark Thomas  > > wrote:
> >
> > > - Reduce instances of setters and getters for the same property
> > existing
> > > on an object and its parent. This may require new objects to be
> > exposed
> > > via JMX.
> > > Fixed enough ?
> >
> > From memory, this was primarily on the Connectors. That is certainly
> a
> > lot better. I'd like to review things before closing this one out.
> >
> >
> > There's indeed a problem on Connector, but I don't see how to fix it.
> >
> > Ex:
> > public void setMaxPostSize(int maxPostSize) {
> > this.maxPostSize = maxPostSize;
> > setProperty("maxPostSize", String.valueOf(maxPostSize));
> > }
> >
> > Both Catalina and Coyote need to access the value. The alternative would
> > be to have the Catalina code use getProperty, which would be both uglier
> > and slower.
>
> I don't see any use of that particular property in Coyote. I think the
> setProperty() call can be removed.
>

:D
Grep confirms that we can remove the setProperty. Ok, that was a horrible
example, but a few others in Connector are useful in both (like
maxSavePostSize, which is one I looked at, then I wrote the post talking
about maxPostSize).


>
> I'm not so sure I'll be able to do that for all the similar calls but
> I'll take a look.
>
> Context was another area where there has been a lot of this. I'll look
> there too.
>
> What I probably need to is start making a note of them when I see them
> and deal with them at the next refactoring opportunity.
>

Ok.

Rémy

Re: Remaining Tomcat 10 items

[Mark Thomas]

On 25/03/2020 13:43, Rémy Maucherat wrote:
> On Mon, Mar 23, 2020 at 11:11 AM Mark Thomas  > wrote:
> 
> > - Reduce instances of setters and getters for the same property
> existing
> > on an object and its parent. This may require new objects to be
> exposed
> > via JMX.
> > Fixed enough ?
> 
> From memory, this was primarily on the Connectors. That is certainly a
> lot better. I'd like to review things before closing this one out.
> 
> 
> There's indeed a problem on Connector, but I don't see how to fix it.
> 
> Ex:
>     public void setMaxPostSize(int maxPostSize) {
>         this.maxPostSize = maxPostSize;
>         setProperty("maxPostSize", String.valueOf(maxPostSize));
>     }
> 
> Both Catalina and Coyote need to access the value. The alternative would
> be to have the Catalina code use getProperty, which would be both uglier
> and slower.

I don't see any use of that particular property in Coyote. I think the
setProperty() call can be removed.

I'm not so sure I'll be able to do that for all the similar calls but
I'll take a look.

Context was another area where there has been a lot of this. I'll look
there too.

What I probably need to is start making a note of them when I see them
and deal with them at the next refactoring opportunity.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: getDeferAccept now returns false in AbstractEndpoint

[remm]

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

remm 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 4c853d3  getDeferAccept now returns false in AbstractEndpoint
4c853d3 is described below

commit 4c853d321df67d43c80f427e9e15016067201dad
Author: remm 
AuthorDate: Fri Mar 27 16:46:21 2020 +0100

getDeferAccept now returns false in AbstractEndpoint

Only APR uses it and it's considered for removal.
---
 java/org/apache/tomcat/util/net/AbstractEndpoint.java |  4 +++-
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 13 -
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 10 --
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 8740af1..ba30767 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -750,7 +750,9 @@ public abstract class AbstractEndpoint {
 public boolean getUseAsyncIO() { return useAsyncIO; }
 
 
-protected abstract boolean getDeferAccept();
+protected boolean getDeferAccept() {
+return false;
+}
 
 
 protected final List negotiableProtocols = new ArrayList<>();
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 2ed8ae4..e54a90e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -85,19 +85,6 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint nioChannels;
 
-// - Properties
-
-
-/**
- * Is deferAccept supported?
- */
-@Override
-public boolean getDeferAccept() {
-// Not supported
-return false;
-}
-
-
 // - Public Methods
 
 
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index b4da738..5c97023 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -130,16 +130,6 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 private Poller poller = null;
 
 
-/**
- * Is deferAccept supported?
- */
-@Override
-public boolean getDeferAccept() {
-// Not supported
-return false;
-}
-
-
 // - Public Methods
 
 /**


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-native] martin-g commented on issue #7: BZ 64260: Clean up install target

[GitBox]

martin-g commented on issue #7: BZ 64260: Clean up install target
URL: https://github.com/apache/tomcat-native/pull/7#issuecomment-605054606
 
 
   I will test this soon on Linux ARM64!


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] 02/04: Update French translations

[markt]

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

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

commit 967cc38a7466a267a88ac46f420e54a415c77d6f
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:31:18 2020 +

Update French translations
---
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../group/interceptors/LocalStrings_fr.properties |  2 +-
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  2 +-
 java/org/apache/coyote/LocalStrings_fr.properties |  2 +-
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../jasper/resources/LocalStrings_fr.properties   | 12 ++--
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/http/LocalStrings_fr.properties   |  7 +++
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 .../WEB-INF/classes/LocalStrings_fr.properties|  2 +-
 16 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index 84a7843..14993be 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -58,7 +58,7 @@ singleSignOn.debug.sessionTimeout=Le SSO traite un timeout 
pour la session SSO [
 singleSignOn.debug.update=Le SSO met à jour la session SSO [{0}] avec le type 
d''authentification [{1}]
 singleSignOn.sessionExpire.contextNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le contexte n''a pas été trouvé
 singleSignOn.sessionExpire.engineNull=Le SSO n''a pu faire expirer la session 
[{0}] parce que le moteur est null
-singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas expirer le session 
[{0}] parce l''hôte ("Host") n''a a pas été trouvé
+singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas faire expirer le 
session [{0}] parce que l''hôte ("Host") n''a pas été trouvé
 singleSignOn.sessionExpire.managerError=Impossible d''expirer la session [{0}] 
parce que le Manager a lancé une exception lors de la recherche de la session
 singleSignOn.sessionExpire.managerNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le gestionnaire de sessions n''a pas été trouvé
 singleSignOn.sessionExpire.sessionNotFound=Impossible d''expirer la session 
[{0}] parce que la session n''a pas été trouvée
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 2f8a72f..caad16a 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -203,7 +203,7 @@ standardContext.resourcesInit=Erreur d'initialisation des 
ressources statiques
 standardContext.resourcesStart=Erreur lors du démarrage des ressources 
statiques
 standardContext.resourcesStop=Erreur lors de l'arrêt des ressources statiques
 standardContext.sciFail=Erreur lors du traitement de 
ServletContainerInitializer
-standardContext.securityConstraint.mixHttpMethod=Il n'est pas permis de 
combiner  et  dans la même collection de 
resources web
+standardContext.securityConstraint.mixHttpMethod=Il n'est pas permis de 
combiner  et  dans la même collection de 
ressources web
 standardContext.securityConstraint.pattern= [{0}] invalide 
d''après les contraintes de sécurité (security constraint)
 standardContext.servletFail=Un ou plusieurs Servlets n'ont pas pu démarrer, 
les détails sont dans le fichier log du conteneur
 standardContext.servletMap.name=L''association de servlet (servlet mapping) 
indique un nom de servlet inconnu [{0}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties 
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index 11cdc1e..3a342c2 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -59,7 +59,7 @@ remoteIpFilter.invalidHostHeader=La valeur invalide [{0}] a 
été trouvée pour
 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}]
+requestFilter.deny=Refus de la requête [{0}] d''après la propriété [{1}]
 
 restCsrfPreventionFilter.invalidNonce=La validation du nonce de CSRF a échouée
 
diff --gi

[tomcat] 01/04: Reword for clarity

[markt]

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

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

commit b0052d95eb5089d0fba220fa70a411a7b933265d
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:30:48 2020 +

Reword for clarity
---
 java/org/apache/jasper/resources/LocalStrings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index f6123be..df88df1 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -195,8 +195,8 @@ jsp.error.tagdirective.badbodycontent=Invalid body-content 
[{0}] in tag directiv
 jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
 jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with 
"/WEB-INF/tags" or "/META-INF/tags"
 jsp.error.tagfile.missingPath=Path not specified to tag file
-jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in 
line [{1}] and whose name attribute is [{0}], the value of this 
name-from-attribute attribute) must be of type java.lang.String, is "required" 
and not a "rtexprvalue".
-jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name attribute with a value [{0}], the value of this name-from-attribute 
attribute.
+jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at 
line [{1}] with name [{0}] that matches the name-from-attribute value of this 
variable directive must be of type java.lang.String, must be "required" and 
must not be a "rtexprvalue".
+jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name [{0}] that matches the name-from-attribute value of this variable 
directive
 jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in 
line [{2}] are the same.
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] 
cannot be resolved in either web.xml or the jar files deployed with this 
application
 jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/04: Update changelog

[markt]

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

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

commit 91f85ea7224f02ee652544d455fd98422731313f
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:32:10 2020 +

Update changelog
---
 webapps/docs/changelog.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5c75e31..50921ca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -82,6 +82,18 @@
   
 
   
+  
+
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. Contribution provided by Tom Bens. (remm)
+  
+  
+Expand the coverage of the Chinese translations provided with Apache
+Tomcat. Contribution provided by Lee Yazhou. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/04: Update Chinese translations

[markt]

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

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

commit 5cb97572ee9a01a01efae7aecf939f7ab9b53e6c
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:31:28 2020 +

Update Chinese translations
---
 .../catalina/authenticator/LocalStrings_zh_CN.properties |  3 +++
 .../apache/catalina/connector/LocalStrings_zh_CN.properties  |  3 +++
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties  | 12 
 .../org/apache/catalina/deploy/LocalStrings_zh_CN.properties |  1 +
 .../apache/catalina/ha/deploy/LocalStrings_zh_CN.properties  |  1 +
 .../apache/catalina/ha/session/LocalStrings_zh_CN.properties |  2 ++
 .../org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties |  2 ++
 .../org/apache/catalina/loader/LocalStrings_zh_CN.properties |  3 +++
 .../apache/catalina/manager/LocalStrings_zh_CN.properties|  2 ++
 java/org/apache/catalina/realm/LocalStrings_zh_CN.properties |  6 ++
 .../apache/catalina/servlets/LocalStrings_zh_CN.properties   |  2 ++
 .../apache/catalina/session/LocalStrings_zh_CN.properties|  6 ++
 .../apache/catalina/startup/LocalStrings_zh_CN.properties|  6 ++
 .../catalina/tribes/tipis/LocalStrings_zh_CN.properties  |  1 +
 java/org/apache/catalina/users/LocalStrings_zh_CN.properties |  1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties  |  1 +
 .../org/apache/catalina/valves/LocalStrings_zh_CN.properties |  2 ++
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties |  5 +
 java/org/apache/coyote/http11/LocalStrings_zh_CN.properties  |  3 +++
 .../apache/jasper/resources/LocalStrings_zh_CN.properties|  6 ++
 java/org/apache/tomcat/util/LocalStrings_zh_CN.properties|  1 +
 .../tomcat/util/http/parser/LocalStrings_zh_CN.properties|  1 +
 .../util/threads/res}/LocalStrings_zh_CN.properties  |  7 +--
 .../apache/tomcat/websocket/LocalStrings_zh_CN.properties|  6 ++
 24 files changed, 77 insertions(+), 6 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 33cb87a..69fd28a 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -32,6 +32,7 @@ basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
 digestAuthenticator.cacheRemove=已从客户端 nonce 
缓存中删除有效条目，以便为新条目腾出空间。重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增加nonceCacheSize。此类型的进一步警告将被抑制5分钟。
 
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
+formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.cookieCheck=SSO检查SSO cookie
@@ -41,8 +42,10 @@ singleSignOn.debug.hasPrincipal=找到以前经过身份验证的主体[{0}]
 singleSignOn.debug.invoke=SSO为[{0}]处理请求
 singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
 singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
+singleSignOn.debug.principalNotFound=SSO未找到缓存的Principal，为会话[{0}]擦除SSO cookie
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
 singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
+singleSignOn.sessionExpire.contextNotFound=SSO无法中止[{0}]，因为Context未找到
 singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效
 singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异常，导致单点登录无法使会话[{0}]失效
 singleSignOn.sessionExpire.managerNotFound=SSO无法使会话[{0}]过期，因为找不到管理器
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index b8e95ad..f12fdbc 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -29,6 +29,7 @@ coyoteRequest.attributeEvent=属性事件侦听器引发的异常
 coyoteRequest.authenticate.ise=):提交响应后无法调用authenticate()
 coyoteRequest.changeSessionId=无法更改 session ID。 没有与此请求关联的 session。
 
coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大，导致参数不能解析。因为当前请求是块状请求，后续也不会处理。如果应用程序需要接收大的POST请求，可以使用连接器的maxPostSize解决它。
+coyoteRequest.getReader.ise=当前请求已经调用过方法getInputStream()
 coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
 
coyoteRequest.maxPostSizeExceeded=):大多部分请求包含的参数数据（不包括上载的文件）超过了关联连接器上设置的maxPostSize
 的限制
 coyoteRequest.sendfileNotCanonical=无法确定指定用于sendfile的文件[{0}]的规范名称
@@ -46,4 +47,6 @@ request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作
 
 requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
 
+response.sendRedirectFail=重定向到[{0}]失败
+
 responseFacade.nullResponse=响应对象已被回收，不再与此外观关联
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 595dd3b..2b88e05 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -39,8 +39,1

[tomcat] branch 7.0.x updated (a99c9c9 -> 91f85ea)

[markt]

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

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


from a99c9c9  Correct order
 new b0052d9  Reword for clarity
 new 967cc38  Update French translations
 new 5cb9757  Update Chinese translations
 new 91f85ea  Update changelog

The 4 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:
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../authenticator/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/connector/LocalStrings_zh_CN.properties  |  3 +++
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/core/LocalStrings_zh_CN.properties   | 12 
 .../catalina/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../catalina/ha/deploy/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/ha/session/LocalStrings_zh_CN.properties |  2 ++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties |  2 ++
 .../catalina/loader/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/manager/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/realm/LocalStrings_zh_CN.properties  |  6 ++
 .../catalina/servlets/LocalStrings_zh_CN.properties   |  2 ++
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/session/LocalStrings_zh_CN.properties|  6 ++
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../catalina/startup/LocalStrings_zh_CN.properties|  6 ++
 .../group/interceptors/LocalStrings_fr.properties |  2 +-
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  2 +-
 .../tribes/tipis/LocalStrings_zh_CN.properties|  1 +
 .../catalina/users/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/util/LocalStrings_zh_CN.properties   |  1 +
 .../catalina/valves/LocalStrings_zh_CN.properties |  2 ++
 java/org/apache/coyote/LocalStrings_fr.properties |  2 +-
 .../apache/coyote/ajp/LocalStrings_zh_CN.properties   |  5 +
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/LocalStrings_zh_CN.properties   |  3 +++
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../apache/jasper/resources/LocalStrings.properties   |  4 ++--
 .../jasper/resources/LocalStrings_fr.properties   | 12 ++--
 .../jasper/resources/LocalStrings_zh_CN.properties|  6 ++
 .../apache/tomcat/util/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/http/LocalStrings_fr.properties   |  7 +++
 .../util/http/parser/LocalStrings_zh_CN.properties|  1 +
 .../util/threads/res}/LocalStrings_zh_CN.properties   |  2 +-
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties|  6 ++
 webapps/docs/changelog.xml| 12 
 .../WEB-INF/classes/LocalStrings_fr.properties|  2 +-
 42 files changed, 128 insertions(+), 37 deletions(-)
 copy java/org/apache/{catalina/security => 
tomcat/util/threads/res}/LocalStrings_zh_CN.properties (86%)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat Version 7.0.100: Service Loader no logging statements

[Rémy Maucherat]

On Fri, Mar 27, 2020 at 9:19 AM Martin Grigorov 
wrote:

> Hi,
>
> On Thu, Mar 26, 2020 at 11:23 PM Rémy Maucherat  wrote:
>
>> On Thu, Mar 26, 2020 at 9:16 PM Christopher O'Connell <
>> coconnel...@gmail.com> wrote:
>>
>>> The Tomcat release version 7.0.100 introduced a bug that prevented
>>> ServiceLoaders from being started. This was fixed by the ticket:
>>> https://bz.apache.org/bugzilla/show_bug.cgi?id=64191 (Thank you for
>>> the fix)
>>>
>>> This problem ended up causing an application I was working on from
>>> running correctly. In an attempt to resolve, I tried turning up
>>> logging but there does not appear to be any logging in this section of
>>> the code, error or otherwise.
>>>
>>> Would it be possible to add additional logging, specifically in the
>>> WebappServiceLoader.java class? I'd be willing to submit code to
>>> address this concern.
>>>
>>
>> -1
>> Adding useless verbose logging just to reassure you that there's no bug
>> in the container is quite pointless. SCI processing is not something that
>> is complex, and if your SCI is found you can log there.
>>
>
> The benefit of having the log statement (as DEBUG) in Tomcat's code base
> is that the developer can see all SCI impls being used in the application,
> not just "mine SCI".
> And often "mine SCI" is not really mine but provided by some web framework
> like Spring MVC, RestEasy, etc. If those have their own log statements then
> I could enable them one by one. But it is possible that they won't have
> such too.
> Is there any harm of having such log statement in Tomcat ? It loads those
> classes at application start time so it is not a hot path.
>

Right, so I don't like a "No SCI found in JAR [{0}]" log, it doesn't sound
very useful. Then the log "SCI found in JAR [{0}]" is better, but since the
SCI of the user is then run I suppose it's not that useful either. Also,
this is about adding a log to debug a bug in Tomcat that is now fixed so
it's pointless.
The person should submit a test case instead, this is a more efficient way
to make sure complex SCI problems don't occur again.

Rémy


>
> My 2c.
> Martin
>
>
>>
>> Rémy
>>
>>
>>>
>>> Thanks,
>>>
>>> Chris
>>>
>>> -
>>> 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: Update chaneglog

[markt]

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 bf094bb  Update chaneglog
bf094bb is described below

commit bf094bb325169aec9f23a74bac7869a876326c2b
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:28:14 2020 +

Update chaneglog
---
 webapps/docs/changelog.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bd59ac0..567be56 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -86,6 +86,18 @@
   
 
   
+  
+
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. Contribution provided by Tom Bens. (remm)
+  
+  
+Expand the coverage of the Chinese translations provided with Apache
+Tomcat. Contribution provided by Lee Yazhou. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Fix format

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new fa15b2a  Fix format
fa15b2a is described below

commit fa15b2a65dda35b22e53a4c71db55310254965a6
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:27:36 2020 +

Fix format
---
 webapps/docs/changelog.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c0c10d0..31df791 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -101,6 +101,7 @@
 Tomcat. Contribution provided by Lee Yazhou. (markt)
   
 
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/05: Update French translations

[markt]

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 f38dd4545a8ea6bfa45667f4911fa0c8e65eef85
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:25:20 2020 +

Update French translations
---
 java/javax/el/LocalStrings_fr.properties  |  4 ++--
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../group/interceptors/LocalStrings_fr.properties |  4 ++--
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  8 
 .../tribes/transport/LocalStrings_fr.properties   |  2 +-
 java/org/apache/coyote/LocalStrings_fr.properties |  4 ++--
 java/org/apache/coyote/ajp/LocalStrings_fr.properties |  2 +-
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties|  2 +-
 .../jasper/resources/LocalStrings_fr.properties   | 14 +++---
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/http/LocalStrings_fr.properties   |  9 -
 .../util/http/parser/LocalStrings_fr.properties   |  2 +-
 .../util/net/openssl/LocalStrings_fr.properties   |  3 ++-
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 .../WEB-INF/classes/LocalStrings_fr.properties|  2 +-
 22 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/java/javax/el/LocalStrings_fr.properties 
b/java/javax/el/LocalStrings_fr.properties
index 5057d0c..3c1388e 100644
--- a/java/javax/el/LocalStrings_fr.properties
+++ b/java/javax/el/LocalStrings_fr.properties
@@ -31,7 +31,7 @@ importHandler.ambiguousStaticImport=L''import statique [{0}] 
ne peut pas être t
 importHandler.classNotFound=La classe [{0}] n''a pu être importée, vu qu''on 
ne l''a pas trouvée
 importHandler.invalidClass=La classe [{0}] doit être publique, non abstraite, 
et ne pas être une interface
 importHandler.invalidClassName=Le nom de la classe à importer [{0}] doit 
comprendre un paquet
-importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour 
l''importation statique [{1}] n''est pas valide
+importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour 
l''import statique [{1}] n''est pas valide
 importHandler.invalidStaticName=Le nom de la méthode statique ou champ à 
importer [{0}] doit inclure une calsse
 importHandler.staticNotFound=L''importation statique [{0}] n''a pas été 
trouvée dans la classe [{1}] pour [{2}]
 
@@ -45,7 +45,7 @@ propertyReadError=Erreur lors de la lecture de [{1}] sur le 
type [{0}]
 propertyWriteError=Erreur d''écriture [{1}] sur le type [{0}]
 
 staticFieldELResolver.methodNotFound=Aucune méthode publique et statique 
nommée [{0}] n''a été trouvée dans la classe [{1}]
-staticFieldELResolver.notFound=Un champ statique et public nommé [{0}] n''a 
pas pu être trouvé sur la classe [{1}]
+staticFieldELResolver.notFound=Aucun champ public statique nommé [{0}] n''a 
été trouvé dans la classe [{1}] (exportée pour Java 9+)
 staticFieldELResolver.notWriteable=L''écriture dans les champs statiques 
(champ [{0}] dans la classe [{1}] dans le cas présent) est interdite
 
 util.method.ambiguous=Impossible de trouver une méthode non ambiguë: 
{0}.{1}({2})
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index d775459..363be09 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -61,7 +61,7 @@ singleSignOn.debug.sessionTimeout=Le SSO traite un timeout 
pour la session SSO [
 singleSignOn.debug.update=Le SSO met à jour la session SSO [{0}] avec le type 
d''authentification [{1}]
 singleSignOn.sessionExpire.contextNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le contexte n''a pas été trouvé
 singleSignOn.sessionExpire.engineNull=Le SSO n''a pu faire expirer la session 
[{0}] parce que le moteur est null
-singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas expirer le session 
[{0}] parce l''hôte ("Host") n''a a pas été trouvé
+singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas faire expirer le 
session [{0}] parce que l''hôte ("Host") n''a pas été trouvé
 singleSignOn.sessionExpire.managerError=Impossible d''expirer la session [{0}] 
parce que le Manager a lancé une exception lors de la recherche de la session
 singleSignOn.sessionExpire.managerNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le gestionnaire de sessions n''a

[tomcat] 03/05: Remove terms back-ported in error

[markt]

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 82fbb8078a62676441567fe4a18f1032ca77b8e4
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:25:53 2020 +

Remove terms back-ported in error
---
 java/javax/servlet/LocalStrings.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/javax/servlet/LocalStrings.properties 
b/java/javax/servlet/LocalStrings.properties
index cad5eb7..b57cb4c 100644
--- a/java/javax/servlet/LocalStrings.properties
+++ b/java/javax/servlet/LocalStrings.properties
@@ -21,6 +21,3 @@ httpMethodConstraintElement.invalidMethod=Invalid HTTP method
 
 value.false=false
 value.true=true
-
-wrapper.nullRequest=Request cannot be null
-wrapper.nullResponse=Response cannot be null


-
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 (05a5ed4 -> 9f41378)

[markt]

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 05a5ed4  Correct order
 new 7937ac5  REword for clarity
 new f38dd45  Update French translations
 new 82fbb80  Remove terms back-ported in error
 new 024fdde  Fix ordering
 new 9f41378  Update Chinese translations

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


Summary of changes:
 java/javax/el/LocalStrings.properties   |  2 +-
 java/javax/el/LocalStrings_fr.properties|  4 ++--
 java/javax/servlet/LocalStrings.properties  |  3 ---
 java/javax/servlet/LocalStrings_zh_CN.properties|  3 +++
 .../authenticator/LocalStrings_fr.properties|  2 +-
 .../authenticator/LocalStrings_zh_CN.properties |  3 +++
 .../connector/LocalStrings_zh_CN.properties |  5 +
 .../apache/catalina/core/LocalStrings_fr.properties |  2 +-
 .../catalina/core/LocalStrings_zh_CN.properties | 13 +
 .../catalina/deploy/LocalStrings_zh_CN.properties   |  1 +
 .../catalina/filters/LocalStrings_fr.properties |  2 +-
 .../ha/context}/LocalStrings_zh_CN.properties   |  2 +-
 .../ha/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/ha/session/LocalStrings_fr.properties  |  4 ++--
 .../ha/session/LocalStrings_zh_CN.properties|  5 +
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties   |  4 
 .../catalina/loader/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/manager/LocalStrings_zh_CN.properties  |  2 ++
 .../catalina/realm/LocalStrings_zh_CN.properties|  6 ++
 .../catalina/servlets/LocalStrings_zh_CN.properties |  2 ++
 .../catalina/session/LocalStrings_fr.properties |  4 +++-
 .../catalina/session/LocalStrings_zh_CN.properties  |  6 ++
 .../catalina/startup/LocalStrings_fr.properties | 19 ++-
 .../catalina/startup/LocalStrings_zh_CN.properties  |  6 ++
 .../tribes/group/LocalStrings_zh_CN.properties  |  2 ++
 .../group/interceptors/LocalStrings_fr.properties   |  4 ++--
 .../interceptors/LocalStrings_zh_CN.properties  |  3 +++
 .../tribes/jmx/LocalStrings_zh_CN.properties|  1 +
 .../tribes/membership/LocalStrings_zh_CN.properties |  3 +++
 .../tribes/tipis/LocalStrings_fr.properties |  8 
 .../tribes/tipis/LocalStrings_zh_CN.properties  |  4 
 .../tribes/transport/LocalStrings_fr.properties |  2 +-
 .../transport/nio/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/users/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/util/LocalStrings_zh_CN.properties |  1 +
 .../catalina/valves/LocalStrings_zh_CN.properties   |  2 ++
 .../webresources/LocalStrings_zh_CN.properties  |  6 ++
 java/org/apache/coyote/LocalStrings_fr.properties   |  4 ++--
 .../org/apache/coyote/LocalStrings_zh_CN.properties |  6 ++
 .../apache/coyote/ajp/LocalStrings_fr.properties|  2 +-
 .../apache/coyote/ajp/LocalStrings_ko.properties|  2 +-
 .../apache/coyote/ajp/LocalStrings_zh_CN.properties |  3 +++
 .../apache/coyote/http11/LocalStrings_fr.properties |  5 +++--
 .../coyote/http11/LocalStrings_zh_CN.properties |  3 +++
 .../http11/filters/LocalStrings_fr.properties   |  2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties  |  2 +-
 .../coyote/http2/LocalStrings_zh_CN.properties  |  3 +++
 .../apache/jasper/resources/LocalStrings.properties | 21 +++--
 .../jasper/resources/LocalStrings_fr.properties | 14 +++---
 .../jasper/resources/LocalStrings_zh_CN.properties  |  8 
 .../tomcat/util/LocalStrings_zh_CN.properties   |  1 +
 .../util/compat/LocalStrings_zh_CN.properties   |  1 +
 .../util/descriptor/LocalStrings_fr.properties  |  2 +-
 .../descriptor/web/LocalStrings_zh_CN.properties|  1 +
 .../tomcat/util/http/LocalStrings_fr.properties |  9 -
 .../util/http/parser/LocalStrings_fr.properties |  2 +-
 .../util/http/parser/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties   |  9 +
 .../util/net/jsse/LocalStrings_zh_CN.properties |  2 ++
 .../util/net/openssl/LocalStrings_fr.properties |  3 ++-
 .../util/net/openssl/LocalStrings_zh_CN.properties  |  2 ++
 .../util/threads/res}/LocalStrings_zh_CN.properties |  2 +-
 .../tomcat/websocket/LocalStrings_fr.properties |  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties  |  6 ++
 .../WEB-INF/classes/LocalStrings_fr.properties  |  2 +-
 65 files changed, 200 insertions(+), 65 deletions(-)
 copy java/org/apache/{tomcat/util/modeler => 
catalina/ha/context}/LocalStrings_zh_CN.properties (92%)
 copy java/org/apache/{catalina/ha/authenticator => 
tomcat/util/threads/r

[tomcat] 05/05: Update Chinese translations

[markt]

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 9f413780f09d7749f6667c8425a77576abf6177b
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:26:38 2020 +

Update Chinese translations
---
 java/javax/servlet/LocalStrings_zh_CN.properties|  3 +++
 .../catalina/authenticator/LocalStrings_zh_CN.properties|  3 +++
 .../apache/catalina/connector/LocalStrings_zh_CN.properties |  5 +
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 13 +
 .../apache/catalina/deploy/LocalStrings_zh_CN.properties|  1 +
 .../jmx => ha/context}/LocalStrings_zh_CN.properties|  3 +--
 .../apache/catalina/ha/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/ha/session/LocalStrings_zh_CN.properties   |  5 +
 .../apache/catalina/ha/tcp/LocalStrings_zh_CN.properties|  4 
 .../apache/catalina/loader/LocalStrings_zh_CN.properties|  3 +++
 .../apache/catalina/manager/LocalStrings_zh_CN.properties   |  2 ++
 .../org/apache/catalina/realm/LocalStrings_zh_CN.properties |  6 ++
 .../apache/catalina/servlets/LocalStrings_zh_CN.properties  |  2 ++
 .../apache/catalina/session/LocalStrings_zh_CN.properties   |  6 ++
 .../apache/catalina/startup/LocalStrings_zh_CN.properties   |  6 ++
 .../catalina/tribes/group/LocalStrings_zh_CN.properties |  2 ++
 .../tribes/group/interceptors/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/tribes/jmx/LocalStrings_zh_CN.properties   |  1 +
 .../tribes/membership/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/tribes/tipis/LocalStrings_zh_CN.properties |  4 
 .../tribes/transport/nio/LocalStrings_zh_CN.properties  |  3 +++
 .../org/apache/catalina/users/LocalStrings_zh_CN.properties |  2 ++
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties |  1 +
 .../apache/catalina/valves/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/webresources/LocalStrings_zh_CN.properties |  6 ++
 java/org/apache/coyote/LocalStrings_zh_CN.properties|  6 ++
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties|  3 +++
 java/org/apache/coyote/http11/LocalStrings_zh_CN.properties |  3 +++
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties  |  3 +++
 .../apache/jasper/resources/LocalStrings_zh_CN.properties   |  8 
 java/org/apache/tomcat/util/LocalStrings_zh_CN.properties   |  1 +
 .../apache/tomcat/util/compat/LocalStrings_zh_CN.properties |  1 +
 .../util/descriptor/web/LocalStrings_zh_CN.properties   |  1 +
 .../tomcat/util/http/parser/LocalStrings_zh_CN.properties   |  1 +
 .../apache/tomcat/util/net/LocalStrings_zh_CN.properties|  9 +
 .../tomcat/util/net/jsse/LocalStrings_zh_CN.properties  |  2 ++
 .../tomcat/util/net/openssl/LocalStrings_zh_CN.properties   |  2 ++
 .../util/threads/res}/LocalStrings_zh_CN.properties |  3 +--
 .../apache/tomcat/websocket/LocalStrings_zh_CN.properties   |  6 ++
 39 files changed, 135 insertions(+), 4 deletions(-)

diff --git a/java/javax/servlet/LocalStrings_zh_CN.properties 
b/java/javax/servlet/LocalStrings_zh_CN.properties
index 7fc4358..f1ca507 100644
--- a/java/javax/servlet/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/LocalStrings_zh_CN.properties
@@ -20,3 +20,6 @@ httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
 httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
 
 value.true=true
+
+wrapper.nullRequest=请求不能为空
+wrapper.nullResponse=响应不能为空
diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index c2daba3..5545b03 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -35,6 +35,7 @@ basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
 digestAuthenticator.cacheRemove=已从客户端 nonce 
缓存中删除有效条目，以便为新条目腾出空间。重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增加nonceCacheSize。此类型的进一步警告将被抑制5分钟。
 
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
+formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.cookieCheck=SSO检查SSO cookie
@@ -44,8 +45,10 @@ singleSignOn.debug.hasPrincipal=找到以前经过身份验证的主体[{0}]
 singleSignOn.debug.invoke=SSO为[{0}]处理请求
 singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
 singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
+singleSignOn.debug.principalNotFound=SSO未找到缓存的Principal，为会话[{0}]擦除SSO cookie
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
 singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
+singleSignOn.sessionExpire.contextNotFound=SSO无法中止[{0}]，因为Context未找到
 singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效
 singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异

[tomcat] 01/05: REword for clarity

[markt]

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 7937ac579c3b25aa42ab4962a1aba3c2a9ba60ba
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:23:00 2020 +

REword for clarity
---
 java/javax/el/LocalStrings.properties   |  2 +-
 .../apache/jasper/resources/LocalStrings.properties | 21 +++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/java/javax/el/LocalStrings.properties 
b/java/javax/el/LocalStrings.properties
index 76e4fb8..cead8de 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -29,7 +29,7 @@ expressionFactory.readFailed=Failed to read [{0}]
 importHandler.ambiguousImport=The class [{0}] could not be imported as it 
conflicts with [{1}] which has already been imported
 importHandler.ambiguousStaticImport=The static import [{0}] could not be 
processed as it conflicts with [{1}] which has already been imported
 importHandler.classNotFound=The class [{0}] could not be imported as it could 
not be found
-importHandler.invalidClass=The class [{0}] must be public, non-abstract, not 
an interface and (for Java 9+) in an exported package
+importHandler.invalidClass=The class [{0}] must be public, in an exported 
package (for Java 9+), non-abstract and not an interface
 importHandler.invalidClassName=Name of class to import [{0}] must include a 
package
 importHandler.invalidClassNameForStatic=The class [{0}] specified for static 
import [{1}] is not valid
 importHandler.invalidStaticName=Name of static method or field to import [{0}] 
must include a class
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index bc45b72..0736ae9 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -170,7 +170,7 @@ jsp.error.quotes.unterminated=Unterminated quotes
 jsp.error.scripting.variable.missing_name=Unable to determine scripting 
variable name from attribute [{0}]
 jsp.error.security=Security initialization failed for context
 jsp.error.servlet.destroy.failed=Exception during Servlet.destroy() for JSP 
page
-jsp.error.servlet.invalid.method=JSPs only permit GET POST or HEAD
+jsp.error.servlet.invalid.method=JSPs only permit GET, POST or HEAD. Jasper 
also permits OPTIONS
 jsp.error.setLastModified=Unable to set last modified date for file [{0}]
 jsp.error.signature.classnotfound=The class [{0}] specified in the method 
signature in TLD for the function [{1}] cannot be found. [{2}]
 jsp.error.simpletag.badbodycontent=The TLD for the class [{0}] specifies an 
invalid body-content (JSP) for a SimpleTag.
@@ -191,8 +191,8 @@ jsp.error.tagdirective.badbodycontent=Invalid body-content 
[{0}] in tag directiv
 jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
 jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with 
"/WEB-INF/tags" or "/META-INF/tags"
 jsp.error.tagfile.missingPath=Path not specified to tag file
-jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in 
line [{1}] and whose name attribute is [{0}], the value of this 
name-from-attribute attribute) must be of type java.lang.String, is "required" 
and not a "rtexprvalue".
-jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name attribute with a value [{0}], the value of this name-from-attribute 
attribute.
+jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at 
line [{1}] with name [{0}] that matches the name-from-attribute value of this 
variable directive must be of type java.lang.String, must be "required" and 
must not be a "rtexprvalue".
+jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name [{0}] that matches the name-from-attribute value of this variable 
directive
 jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in 
line [{2}] are the same.
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] 
cannot be resolved in either web.xml or the jar files deployed with this 
application
 jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified
@@ -348,10 +348,11 @@ where options include:\n\
 \-ieplugin  Java Plugin classid for Internet Explorer\n\
 \-classpath  Overrides java.class.path system property\n\
 \-xpoweredBy   Add X-Powered-By response header\n\
-\-trimSpacesRemove template text that consists entirely of 
whitespace\n\
+\-trimSpaces [single]  Remove template text that consists entirely of 
whitespace\n\
+\  (if "single", replace such template text with a 
single space)\n\
 \-javaEncodingSet the encoding charset for Java classes (default 
UTF-8)\n\
-\-source  

[tomcat] 04/05: Fix ordering

[markt]

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 024fdde961c14627f2dce50337f65101fd45d712
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:26:24 2020 +

Fix ordering
---
 java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b896c47..b8927d8 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
 ajpprocessor.request.process=요청 처리 중 오류 발생
 
 ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
 ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한 
UpgradeProtocol 설정은 무시됩니다.
 ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler 
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: This branch is no longer master so don't skip import of English

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 09326aa  This branch is no longer master so don't skip import of 
English
09326aa is described below

commit 09326aa44f6510b14544c0066063683683ef72cf
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:21:51 2020 +

This branch is no longer master so don't skip import of English
---
 java/org/apache/tomcat/buildutil/translate/Import.java | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 3cf4d62..b471f8c 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -43,12 +43,8 @@ public class Import {
 private static void processFile(File f) throws IOException {
 String language = Utils.getLanguage(f.getName());
 
-// Skip the original
-if (language.length() == 0) {
-// Comment this line out if the originals needs to be exported.
-return;
-}
-
+// Unlike the master branch, don't skip the original so we can import
+// updates to the English translations
 Properties props = Utils.load(f);
 Object[] objKeys = props.keySet().toArray();
 Arrays.sort(objKeys);


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/08: Backport updates to French translations

[markt]

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

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

commit e6f4f18d257dfdbe76286c896626169bfd7b1ceb
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:17:15 2020 +

Backport updates to French translations
---
 java/javax/el/LocalStrings_fr.properties  |  4 ++--
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../group/interceptors/LocalStrings_fr.properties |  4 ++--
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  8 
 .../tribes/transport/LocalStrings_fr.properties   |  2 +-
 java/org/apache/coyote/LocalStrings_fr.properties |  4 ++--
 java/org/apache/coyote/ajp/LocalStrings_fr.properties |  2 +-
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties|  2 +-
 .../jasper/resources/LocalStrings_fr.properties   | 14 +++---
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/http/LocalStrings_fr.properties   |  9 -
 .../util/http/parser/LocalStrings_fr.properties   |  2 +-
 .../util/net/openssl/LocalStrings_fr.properties   |  3 ++-
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 .../WEB-INF/classes/LocalStrings_fr.properties|  2 +-
 22 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/java/javax/el/LocalStrings_fr.properties 
b/java/javax/el/LocalStrings_fr.properties
index 5057d0c..3c1388e 100644
--- a/java/javax/el/LocalStrings_fr.properties
+++ b/java/javax/el/LocalStrings_fr.properties
@@ -31,7 +31,7 @@ importHandler.ambiguousStaticImport=L''import statique [{0}] 
ne peut pas être t
 importHandler.classNotFound=La classe [{0}] n''a pu être importée, vu qu''on 
ne l''a pas trouvée
 importHandler.invalidClass=La classe [{0}] doit être publique, non abstraite, 
et ne pas être une interface
 importHandler.invalidClassName=Le nom de la classe à importer [{0}] doit 
comprendre un paquet
-importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour 
l''importation statique [{1}] n''est pas valide
+importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour 
l''import statique [{1}] n''est pas valide
 importHandler.invalidStaticName=Le nom de la méthode statique ou champ à 
importer [{0}] doit inclure une calsse
 importHandler.staticNotFound=L''importation statique [{0}] n''a pas été 
trouvée dans la classe [{1}] pour [{2}]
 
@@ -45,7 +45,7 @@ propertyReadError=Erreur lors de la lecture de [{1}] sur le 
type [{0}]
 propertyWriteError=Erreur d''écriture [{1}] sur le type [{0}]
 
 staticFieldELResolver.methodNotFound=Aucune méthode publique et statique 
nommée [{0}] n''a été trouvée dans la classe [{1}]
-staticFieldELResolver.notFound=Un champ statique et public nommé [{0}] n''a 
pas pu être trouvé sur la classe [{1}]
+staticFieldELResolver.notFound=Aucun champ public statique nommé [{0}] n''a 
été trouvé dans la classe [{1}] (exportée pour Java 9+)
 staticFieldELResolver.notWriteable=L''écriture dans les champs statiques 
(champ [{0}] dans la classe [{1}] dans le cas présent) est interdite
 
 util.method.ambiguous=Impossible de trouver une méthode non ambiguë: 
{0}.{1}({2})
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index d775459..363be09 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -61,7 +61,7 @@ singleSignOn.debug.sessionTimeout=Le SSO traite un timeout 
pour la session SSO [
 singleSignOn.debug.update=Le SSO met à jour la session SSO [{0}] avec le type 
d''authentification [{1}]
 singleSignOn.sessionExpire.contextNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le contexte n''a pas été trouvé
 singleSignOn.sessionExpire.engineNull=Le SSO n''a pu faire expirer la session 
[{0}] parce que le moteur est null
-singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas expirer le session 
[{0}] parce l''hôte ("Host") n''a a pas été trouvé
+singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas faire expirer le 
session [{0}] parce que l''hôte ("Host") n''a pas été trouvé
 singleSignOn.sessionExpire.managerError=Impossible d''expirer la session [{0}] 
parce que le Manager a lancé une exception lors de la recherche de la session
 singleSignOn.sessionExpire.managerNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le gestionnaire de 

[tomcat] 03/08: Reword for clarity

[markt]

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

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

commit 3f3fbfa49ff78eda9c331ec19c87d864b69fed71
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:16:18 2020 +

Reword for clarity
---
 java/javax/el/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/javax/el/LocalStrings.properties 
b/java/javax/el/LocalStrings.properties
index 76e4fb8..cead8de 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -29,7 +29,7 @@ expressionFactory.readFailed=Failed to read [{0}]
 importHandler.ambiguousImport=The class [{0}] could not be imported as it 
conflicts with [{1}] which has already been imported
 importHandler.ambiguousStaticImport=The static import [{0}] could not be 
processed as it conflicts with [{1}] which has already been imported
 importHandler.classNotFound=The class [{0}] could not be imported as it could 
not be found
-importHandler.invalidClass=The class [{0}] must be public, non-abstract, not 
an interface and (for Java 9+) in an exported package
+importHandler.invalidClass=The class [{0}] must be public, in an exported 
package (for Java 9+), non-abstract and not an interface
 importHandler.invalidClassName=Name of class to import [{0}] must include a 
package
 importHandler.invalidClassNameForStatic=The class [{0}] specified for static 
import [{1}] is not valid
 importHandler.invalidStaticName=Name of static method or field to import [{0}] 
must include a class
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 17a0ace..2443f05 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -212,8 +212,8 @@ jsp.error.tagdirective.badbodycontent=Invalid body-content 
[{0}] in tag directiv
 jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
 jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with 
"/WEB-INF/tags" or "/META-INF/tags"
 jsp.error.tagfile.missingPath=Path not specified to tag file
-jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in 
line [{1}] and whose name attribute is [{0}], the value of this 
name-from-attribute attribute) must be of type java.lang.String, is "required" 
and not a "rtexprvalue".
-jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name attribute with a value [{0}], the value of this name-from-attribute 
attribute.
+jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at 
line [{1}] with name [{0}] that matches the name-from-attribute value of this 
variable directive must be of type java.lang.String, must be "required" and 
must not be a "rtexprvalue".
+jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name [{0}] that matches the name-from-attribute value of this variable 
directive
 jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in 
line [{2}] are the same.
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] 
cannot be resolved in either web.xml or the jar files deployed with this 
application
 jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated (cfd2f2e -> 68c7aca)

[markt]

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

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


from cfd2f2e  Really fix order
 new 8cc06d2  Fix order
 new 99fc081  Align formatting
 new 3f3fbfa  Reword for clarity
 new e6f4f18  Backport updates to French translations
 new 94572ab  Fix order
 new 2cb5c7d  Back-port updates to Chinese translations
 new eb951da  Update changelog
 new 68c7aca  Fix deprecation warnings with newer JUnit 4 in 2020.03 
Eclipse IDE

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


Summary of changes:
 java/javax/el/LocalStrings.properties |  2 +-
 java/javax/el/LocalStrings_fr.properties  |  4 ++--
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../authenticator/LocalStrings_zh_CN.properties   |  3 +++
 .../apache/catalina/connector/LocalStrings.properties |  2 +-
 .../catalina/connector/LocalStrings_zh_CN.properties  |  5 +
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/core/LocalStrings_zh_CN.properties   | 13 +
 .../catalina/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../LocalStrings_zh_CN.properties |  2 +-
 .../catalina/ha/deploy/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/ha/session/LocalStrings_zh_CN.properties |  5 +
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties |  4 
 .../catalina/loader/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/manager/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/realm/LocalStrings_zh_CN.properties  |  6 ++
 .../catalina/servlets/LocalStrings_zh_CN.properties   |  2 ++
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/session/LocalStrings_zh_CN.properties|  6 ++
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../catalina/startup/LocalStrings_zh_CN.properties|  6 ++
 .../tribes/group/LocalStrings_zh_CN.properties|  2 ++
 .../group/interceptors/LocalStrings_fr.properties |  4 ++--
 .../group/interceptors/LocalStrings_zh_CN.properties  |  3 +++
 .../catalina/tribes/jmx/LocalStrings_zh_CN.properties |  1 +
 .../tribes/membership/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  8 
 .../tribes/tipis/LocalStrings_zh_CN.properties|  4 
 .../tribes/transport/LocalStrings_fr.properties   |  2 +-
 .../transport/nio/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/users/LocalStrings_zh_CN.properties  |  2 ++
 .../catalina/util/LocalStrings_zh_CN.properties   |  1 +
 .../catalina/valves/LocalStrings_zh_CN.properties |  2 ++
 .../webresources/LocalStrings_zh_CN.properties|  6 ++
 java/org/apache/coyote/LocalStrings_fr.properties |  4 ++--
 java/org/apache/coyote/LocalStrings_zh_CN.properties  |  6 ++
 java/org/apache/coyote/ajp/LocalStrings_fr.properties |  2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties |  2 +-
 .../apache/coyote/ajp/LocalStrings_zh_CN.properties   |  3 +++
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/LocalStrings_zh_CN.properties   |  3 +++
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties|  2 +-
 .../apache/coyote/http2/LocalStrings_zh_CN.properties |  3 +++
 .../apache/jasper/resources/LocalStrings.properties   |  4 ++--
 .../jasper/resources/LocalStrings_fr.properties   | 14 +++---
 .../jasper/resources/LocalStrings_zh_CN.properties|  8 
 .../apache/tomcat/util/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/compat/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../util/descriptor/web/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/util/http/LocalStrings_fr.properties   |  9 -
 .../util/http/parser/LocalStrings_fr.properties   |  2 +-
 .../util/http/parser/LocalStrings_zh_CN.properties|  1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties |  9 +
 .../tomcat/util/net/jsse/LocalStrings.properties  |  2 +-
 .../util/net/jsse/LocalStrings_zh_CN.properties   |  2 ++
 .../util/net/openssl/LocalStrings_fr.properties   |  3 ++-
 .../util/net/openssl/LocalStrings_zh_CN.properties|  2 ++
 .../util/threads/res}/LocalStrings_zh_CN.properties   |  2 +-
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties|  6 ++
 .../org/apache/catalina/

[tomcat] 07/08: Update changelog

[markt]

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

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

commit eb951daa598f9bbb76d0c9a19d276dab1a6a32c7
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:18:45 2020 +

Update changelog
---
 webapps/docs/changelog.xml | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 84fcddf..c0c10d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,6 +90,17 @@
   
 
   
+  
+
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. Contribution provided by Tom Bens. (remm)
+  
+  
+Expand the coverage of the Chinese translations provided with Apache
+Tomcat. Contribution provided by Lee Yazhou. (markt)
+  
+
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 05/08: Fix order

[markt]

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

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

commit 94572ab1e4017a292257d0bb18019d34693d6ce9
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:17:39 2020 +

Fix order
---
 java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b896c47..b8927d8 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
 ajpprocessor.request.process=요청 처리 중 오류 발생
 
 ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
 ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한 
UpgradeProtocol 설정은 무시됩니다.
 ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler 
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/08: Fix order

[markt]

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

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

commit 8cc06d25bbee370129db5aaca7f92085227ecef2
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:15:49 2020 +

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

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index 708122b..b4b0f39 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -29,8 +29,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT 
include an entity (
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler 
initialization failed
 coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler 
instantiation failed
-coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] 
requires the AprLifecycleListener which is not available
 coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] 
requires the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] 
requires the AprLifecycleListener which is not available
 coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
 coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
 coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 06/08: Back-port updates to Chinese translations

[markt]

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

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

commit 2cb5c7da5806f99148829916e1ce6ed90a6559b8
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:18:00 2020 +

Back-port updates to Chinese translations
---
 .../catalina/authenticator/LocalStrings_zh_CN.properties|  3 +++
 .../apache/catalina/connector/LocalStrings_zh_CN.properties |  5 +
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 13 +
 .../apache/catalina/deploy/LocalStrings_zh_CN.properties|  1 +
 .../jmx => ha/context}/LocalStrings_zh_CN.properties|  3 +--
 .../apache/catalina/ha/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/ha/session/LocalStrings_zh_CN.properties   |  5 +
 .../apache/catalina/ha/tcp/LocalStrings_zh_CN.properties|  4 
 .../apache/catalina/loader/LocalStrings_zh_CN.properties|  3 +++
 .../apache/catalina/manager/LocalStrings_zh_CN.properties   |  2 ++
 .../org/apache/catalina/realm/LocalStrings_zh_CN.properties |  6 ++
 .../apache/catalina/servlets/LocalStrings_zh_CN.properties  |  2 ++
 .../apache/catalina/session/LocalStrings_zh_CN.properties   |  6 ++
 .../apache/catalina/startup/LocalStrings_zh_CN.properties   |  6 ++
 .../catalina/tribes/group/LocalStrings_zh_CN.properties |  2 ++
 .../tribes/group/interceptors/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/tribes/jmx/LocalStrings_zh_CN.properties   |  1 +
 .../tribes/membership/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/tribes/tipis/LocalStrings_zh_CN.properties |  4 
 .../tribes/transport/nio/LocalStrings_zh_CN.properties  |  3 +++
 .../org/apache/catalina/users/LocalStrings_zh_CN.properties |  2 ++
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties |  1 +
 .../apache/catalina/valves/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/webresources/LocalStrings_zh_CN.properties |  6 ++
 java/org/apache/coyote/LocalStrings_zh_CN.properties|  6 ++
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties|  3 +++
 java/org/apache/coyote/http11/LocalStrings_zh_CN.properties |  3 +++
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties  |  3 +++
 .../apache/jasper/resources/LocalStrings_zh_CN.properties   |  8 
 java/org/apache/tomcat/util/LocalStrings_zh_CN.properties   |  1 +
 .../apache/tomcat/util/compat/LocalStrings_zh_CN.properties |  1 +
 .../util/descriptor/web/LocalStrings_zh_CN.properties   |  1 +
 .../tomcat/util/http/parser/LocalStrings_zh_CN.properties   |  1 +
 .../apache/tomcat/util/net/LocalStrings_zh_CN.properties|  9 +
 .../tomcat/util/net/jsse/LocalStrings_zh_CN.properties  |  2 ++
 .../tomcat/util/net/openssl/LocalStrings_zh_CN.properties   |  2 ++
 .../util/threads/res}/LocalStrings_zh_CN.properties |  3 +--
 .../apache/tomcat/websocket/LocalStrings_zh_CN.properties   |  6 ++
 38 files changed, 132 insertions(+), 4 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index c2daba3..5545b03 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -35,6 +35,7 @@ basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
 digestAuthenticator.cacheRemove=已从客户端 nonce 
缓存中删除有效条目，以便为新条目腾出空间。重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增加nonceCacheSize。此类型的进一步警告将被抑制5分钟。
 
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
+formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.cookieCheck=SSO检查SSO cookie
@@ -44,8 +45,10 @@ singleSignOn.debug.hasPrincipal=找到以前经过身份验证的主体[{0}]
 singleSignOn.debug.invoke=SSO为[{0}]处理请求
 singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
 singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
+singleSignOn.debug.principalNotFound=SSO未找到缓存的Principal，为会话[{0}]擦除SSO cookie
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
 singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
+singleSignOn.sessionExpire.contextNotFound=SSO无法中止[{0}]，因为Context未找到
 singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效
 singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异常，导致单点登录无法使会话[{0}]失效
 singleSignOn.sessionExpire.managerNotFound=SSO无法使会话[{0}]过期，因为找不到管理器
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index c7207b4..c024ad6 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -34,6 +34,7 @@ coyoteRequest.authenticate.ise=):提交响应后无法调用authenticate()
 coyoteRequest.changeSessionId=无法

[tomcat] 02/08: Align formatting

[markt]

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

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

commit 99fc08178758a1d62d633c7aca3095a67a917b3e
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:16:01 2020 +

Align formatting
---
 java/org/apache/tomcat/util/net/jsse/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
index a129ca1..9bf445c 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
@@ -32,4 +32,4 @@ jsseUtil.trustedCertNotChecked=The validity dates of the 
trusted certificate wit
 jsseUtil.trustedCertNotValid=The trusted certificate with alias [{0}] and DN 
[{1}] is not valid due to [{2}]. Certificates signed by this trusted 
certificate WILL be accepted
 
 pemFile.noMultiPrimes=The PKCS#1 certificate is in multi-prime format and Java 
does not provide an API for constructing an RSA private key object from that 
format
-pemFile.notValidRFC5915=The provided key file does not conform to RFC 5915
\ No newline at end of file
+pemFile.notValidRFC5915=The provided key file does not conform to RFC 5915


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 08/08: Fix deprecation warnings with newer JUnit 4 in 2020.03 Eclipse IDE

[markt]

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

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

commit 68c7aca39e4e6e26e499a1c7090ce1240769a3be
Author: Mark Thomas 
AuthorDate: Fri Mar 27 09:37:51 2020 +

Fix deprecation warnings with newer JUnit 4 in 2020.03 Eclipse IDE
---
 test/org/apache/catalina/core/TestStandardContext.java| 3 ++-
 .../tribes/group/interceptors/TestEncryptInterceptor.java | 3 ++-
 .../apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java | 8 
 test/org/apache/coyote/http2/TestHttp2Limits.java | 5 +++--
 test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java  | 5 +++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardContext.java 
b/test/org/apache/catalina/core/TestStandardContext.java
index b4a386f..f45c763 100644
--- a/test/org/apache/catalina/core/TestStandardContext.java
+++ b/test/org/apache/catalina/core/TestStandardContext.java
@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -972,7 +973,7 @@ public class TestStandardContext extends TomcatBaseTest {
 Context context = new StandardContext();
 
 context.setResourceOnlyServlets("a,b,c");
-
Assert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
+
MatcherAssert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
 CoreMatchers.hasItems("a", "b", "c"));
 }
 
diff --git 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
index 5b76df7..172ca20 100644
--- 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
+++ 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 
 import javax.crypto.Cipher;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
 
@@ -371,7 +372,7 @@ public class TestEncryptInterceptor {
 
 byte[] cipherText2 = 
((ValueCaptureInterceptor)src.getNext()).getValue();
 
-Assert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
+MatcherAssert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
 cipherText1, IsNot.not(IsEqual.equalTo(cipherText2)));
 }
 
diff --git 
a/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java 
b/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
index ec228ae..2104155 100644
--- a/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
+++ b/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
@@ -23,8 +23,8 @@ import java.util.Collections;
 import java.util.List;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -60,12 +60,12 @@ public class TestQuotedStringTokenizer {
 List result = new ArrayList<>();
 int count = tokens.size();
 while (tokenizer.hasMoreTokens()) {
-Assert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(count)));
+MatcherAssert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(count)));
 result.add(tokenizer.nextToken());
 count--;
 }
-Assert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(0)));
-Assert.assertThat(tokens, CoreMatchers.is(result));
+MatcherAssert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(0)));
+MatcherAssert.assertThat(tokens, CoreMatchers.is(result));
 }
 
 }
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index d5f109f..a8f4458 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Random;
 
 import org.hamcrest.Description;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.TypeSafeMatcher;
 
 import org.junit.Assert;
@@ -265,7 +266,7 @@ public class TestHttp2Limits extends Http2TestBase {
 //   above.
 try {
 parser.readFrame(true);
-Assert.assertThat(output.getTrace(), RegexMatcher.matchesRegex(
+MatcherAssert.assertThat(output.getTrace(), 
RegexMatcher.matchesRegex(
 

[tomcat] branch 7.0.x updated: Correct order

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new a99c9c9  Correct order
a99c9c9 is described below

commit a99c9c9035b7310b961408c0aeadc39e42a4032c
Author: Mark Thomas 
AuthorDate: Fri Mar 27 12:50:45 2020 +

Correct order
---
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java   | 2 +-
 java/org/apache/coyote/ajp/LocalStrings.properties| 2 +-
 java/org/apache/coyote/ajp/LocalStrings_fr.properties | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index e324783..028549e 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -208,7 +208,7 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 if (getSecretRequired()) {
 String secret = getSecret();
 if (secret == null || secret.length() == 0) {
-throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
+throw new 
IllegalArgumentException(sm.getString("ajpprotocol.noSecret"));
 }
 }
 super.start();
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties 
b/java/org/apache/coyote/ajp/LocalStrings.properties
index dfd8fa3..496550c 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -37,6 +37,6 @@ ajpprocessor.ssl.notsupported=The SSL protocol is not 
supported by this connecto
 ajpprotocol.endpoint.starterror=Error starting endpoint
 ajpprotocol.failedwrite=Socket write failed
 ajpprotocol.init=Initializing Coyote AJP/1.3 on [{0}]
-ajpprotocol.nosecret=The AJP Connector is configured with 
secretRequired="true" but the secret attribute is either null or "". This 
combination is not valid.
+ajpprotocol.noSecret=The AJP Connector is configured with 
secretRequired="true" but the secret attribute is either null or "". This 
combination is not valid.
 ajpprotocol.request.register=Error registering request processor in JMX
 ajpprotocol.start=Starting Coyote AJP/1.3 on [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties 
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index d6789ae..8a56641 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -28,4 +28,4 @@ ajpprocessor.header.tooLong=Un en-tête de message de taille 
[{0}] a été reçu
 ajpprocessor.request.prepare=Erreur lors de la préparation de la requête
 ajpprocessor.request.process=Erreur de traitement de la requête
 
-ajpprotocol.nosecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index e1ef256..d6869c4 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -28,4 +28,4 @@ ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만,
 ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
 ajpprocessor.request.process=요청 처리 중 오류 발생
 
-ajpprotocol.nosecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Really fix order

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new cfd2f2e  Really fix order
cfd2f2e is described below

commit cfd2f2eaa9c47ed3252b835eb740eed21d73aec6
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:05:40 2020 +

Really fix order
---
 java/org/apache/catalina/manager/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index e1ad20a..001e73b 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -117,8 +117,8 @@ htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
 jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
 
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.certsNotAvailable=Certificate information cannot be obtained 
from this connector at runtime


-
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: Correct order

[markt]

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 05a5ed4  Correct order
05a5ed4 is described below

commit 05a5ed47cac860ca9cff258b9a98be3dc1f108ef
Author: Mark Thomas 
AuthorDate: Fri Mar 27 12:50:45 2020 +

Correct order
---
 java/javax/servlet/LocalStrings.properties   | 3 +++
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java  | 2 +-
 java/org/apache/coyote/ajp/LocalStrings.properties   | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_fr.properties| 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties| 2 +-
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/javax/servlet/LocalStrings.properties 
b/java/javax/servlet/LocalStrings.properties
index b57cb4c..cad5eb7 100644
--- a/java/javax/servlet/LocalStrings.properties
+++ b/java/javax/servlet/LocalStrings.properties
@@ -21,3 +21,6 @@ httpMethodConstraintElement.invalidMethod=Invalid HTTP method
 
 value.false=false
 value.true=true
+
+wrapper.nullRequest=Request cannot be null
+wrapper.nullResponse=Response cannot be null
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 641ec18..1bc9816 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -271,7 +271,7 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 if (getSecretRequired()) {
 String secret = getSecret();
 if (secret == null || secret.length() == 0) {
-throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
+throw new 
IllegalArgumentException(sm.getString("ajpprotocol.noSecret"));
 }
 }
 super.start();
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties 
b/java/org/apache/coyote/ajp/LocalStrings.properties
index 3dc52d9..38067ca 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -32,6 +32,6 @@ ajpprocessor.request.process=Error processing request
 
 ajpprotocol.noBio=The AJP BIO connector has been removed in Tomcat 8.5.x 
onwards. The AJP BIO connector configuration has been automatically switched to 
use the AJP NIO connector instead.
 ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration 
for [{0}] was ignored
+ajpprotocol.noSecret=The AJP Connector is configured with 
secretRequired="true" but the secret attribute is either null or "". This 
combination is not valid.
 ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol 
configuration for [{0}] was ignored
 ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The 
HttpUpgradeHandler [{0}] can not be processed
-ajpprotocol.nosecret=The AJP Connector is configured with 
secretRequired="true" but the secret attribute is either null or "". This 
combination is not valid.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties 
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 48633ec..5acecf3 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -30,4 +30,4 @@ ajpprocessor.request.process=Erreur de traitement de la 
requête
 ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte 
SSL pour [{0}] a été ignorée
 ajpprotocol.noUpgrade=L''upgrade n''est pas supporté par AJP.  La 
configuration UpgradeProtocol pour [{0}] a été ignorée
 ajpprotocol.noUpgradeHandler=AJP ne supporte pas la mise à niveau (upgrade) de 
HTTP/1.1, le HttpUpgradeHandler [{0}] ne peut pas être utilisé
-ajpprotocol.nosecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index 4fa663c..b896c47 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -30,4 +30,4 @@ ajpprocessor.request.process=요청 처리 중 오류 발생
 ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
 ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한 
UpgradeProtocol 설정은 무시됩니다.
 ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler 
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.nosecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
+ajpprotoc

[tomcat] branch master updated: Really fix order

[markt]

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 a4d22c8  Really fix order
a4d22c8 is described below

commit a4d22c8fbf41d5c318d5008e9db5f0ca5f7675ec
Author: Mark Thomas 
AuthorDate: Fri Mar 27 13:05:40 2020 +

Really fix order
---
 java/org/apache/catalina/manager/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index e1ad20a..001e73b 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -117,8 +117,8 @@ htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
 jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
 
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.certsNotAvailable=Certificate information cannot be obtained 
from this connector at runtime


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Correct order

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 35df7ec  Correct order
35df7ec is described below

commit 35df7eca9084d4530d42a3e005a509ec06cc4ec8
Author: Mark Thomas 
AuthorDate: Fri Mar 27 12:50:45 2020 +

Correct order
---
 java/javax/servlet/LocalStrings.properties | 6 +++---
 java/org/apache/catalina/manager/LocalStrings.properties   | 6 +++---
 java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
 java/org/apache/catalina/tribes/membership/LocalStrings.properties | 1 +
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java| 2 +-
 java/org/apache/coyote/ajp/LocalStrings.properties | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_fr.properties  | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties  | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/tomcat/util/digester/LocalStrings.properties   | 4 ++--
 10 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/java/javax/servlet/LocalStrings.properties 
b/java/javax/servlet/LocalStrings.properties
index f677ffb..cad5eb7 100644
--- a/java/javax/servlet/LocalStrings.properties
+++ b/java/javax/servlet/LocalStrings.properties
@@ -19,8 +19,8 @@ httpConstraintElement.invalidRolesDeny=Roles may not be 
specified when using DEN
 
 httpMethodConstraintElement.invalidMethod=Invalid HTTP method
 
-wrapper.nullRequest=Request cannot be null
-wrapper.nullResponse=Response cannot be null
-
 value.false=false
 value.true=true
+
+wrapper.nullRequest=Request cannot be null
+wrapper.nullResponse=Response cannot be null
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index afc1fec..e1ad20a 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -117,6 +117,9 @@ htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
+jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.certsNotAvailable=Certificate information cannot be obtained 
from this connector at runtime
 managerServlet.copyError=Could not copy configuration file from path [{0}]
@@ -192,6 +195,3 @@ managerServlet.vminfo=OK - VM info
 
 statusServlet.complete=Complete Server Status
 statusServlet.title=Server Status
-
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
-jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties 
b/java/org/apache/catalina/realm/LocalStrings.properties
index 4139377..0229e73 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -100,8 +100,8 @@ realmBase.authenticateSuccess=Username [{0}] successfully 
authenticated
 realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
 realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an 
X509UsernameRetriever.
 realmBase.createUsernameRetriever.newInstance=Cannot create object of type 
[{0}].
-realmBase.delegatedCredentialFail=Unable to obtain delegated credential for 
user [{0}]
 realmBase.credentialNotDelegated=Credential for user [{0}] has not been 
delegated though storing was requested
+realmBase.delegatedCredentialFail=Unable to obtain delegated credential for 
user [{0}]
 realmBase.digest=Error digesting user credentials
 realmBase.forbidden=Access to the requested resource has been denied
 realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 7119594..6237640 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -61,5 +61,6 @@ staticMembershipProvider.pingThread.failed=Unable to send 
ping.
 staticMembershipProvider.replyRequest.ignored=Message[{0}] is ignored.
 staticMembershipProvider.startMembership.noReplies=Received 0 replies, 
probably a timeout.
 staticMembershipProvider.stopMembership.sendFailed=Unable to send stop 
membership message.
+
 staticMembershipService.noLocalMember=There is no localMember in static member 
list.
 staticMembershipSer

[tomcat] branch master updated: Correct order

[markt]

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 047680a  Correct order
047680a is described below

commit 047680ad3f37e30119cd98109b0593c2fafe5dd4
Author: Mark Thomas 
AuthorDate: Fri Mar 27 12:50:45 2020 +

Correct order
---
 java/jakarta/servlet/LocalStrings.properties   | 6 +++---
 java/org/apache/catalina/manager/LocalStrings.properties   | 6 +++---
 java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
 java/org/apache/catalina/tribes/membership/LocalStrings.properties | 1 +
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java| 2 +-
 java/org/apache/coyote/ajp/LocalStrings.properties | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_fr.properties  | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties  | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties   | 2 +-
 java/org/apache/tomcat/util/digester/LocalStrings.properties   | 4 ++--
 10 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/java/jakarta/servlet/LocalStrings.properties 
b/java/jakarta/servlet/LocalStrings.properties
index f677ffb..cad5eb7 100644
--- a/java/jakarta/servlet/LocalStrings.properties
+++ b/java/jakarta/servlet/LocalStrings.properties
@@ -19,8 +19,8 @@ httpConstraintElement.invalidRolesDeny=Roles may not be 
specified when using DEN
 
 httpMethodConstraintElement.invalidMethod=Invalid HTTP method
 
-wrapper.nullRequest=Request cannot be null
-wrapper.nullResponse=Response cannot be null
-
 value.false=false
 value.true=true
+
+wrapper.nullRequest=Request cannot be null
+wrapper.nullResponse=Response cannot be null
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index afc1fec..e1ad20a 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -117,6 +117,9 @@ htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
+jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.certsNotAvailable=Certificate information cannot be obtained 
from this connector at runtime
 managerServlet.copyError=Could not copy configuration file from path [{0}]
@@ -192,6 +195,3 @@ managerServlet.vminfo=OK - VM info
 
 statusServlet.complete=Complete Server Status
 statusServlet.title=Server Status
-
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] 
arguments on object name [{2}], which is a [{3}]
-jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties 
b/java/org/apache/catalina/realm/LocalStrings.properties
index 788652b..2892408 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -101,8 +101,8 @@ realmBase.authenticateSuccess=Username [{0}] successfully 
authenticated
 realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
 realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an 
X509UsernameRetriever.
 realmBase.createUsernameRetriever.newInstance=Cannot create object of type 
[{0}].
-realmBase.delegatedCredentialFail=Unable to obtain delegated credential for 
user [{0}]
 realmBase.credentialNotDelegated=Credential for user [{0}] has not been 
delegated though storing was requested
+realmBase.delegatedCredentialFail=Unable to obtain delegated credential for 
user [{0}]
 realmBase.digest=Error digesting user credentials
 realmBase.forbidden=Access to the requested resource has been denied
 realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 7119594..6237640 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -61,5 +61,6 @@ staticMembershipProvider.pingThread.failed=Unable to send 
ping.
 staticMembershipProvider.replyRequest.ignored=Message[{0}] is ignored.
 staticMembershipProvider.startMembership.noReplies=Received 0 replies, 
probably a timeout.
 staticMembershipProvider.stopMembership.sendFailed=Unable to send stop 
membership message.
+
 staticMembershipService.noLocalMember=There is no localMember in static member 
list.
 staticMe

[tomcat] branch master updated: Reword for clarity

[markt]

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 23ee190  Reword for clarity
23ee190 is described below

commit 23ee1901c85566ea9563206526ffa1ef2d7f7b70
Author: Mark Thomas 
AuthorDate: Fri Mar 27 12:45:29 2020 +

Reword for clarity
---
 java/jakarta/el/LocalStrings.properties  | 2 +-
 java/org/apache/jasper/resources/LocalStrings.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/jakarta/el/LocalStrings.properties 
b/java/jakarta/el/LocalStrings.properties
index 76e4fb8..cead8de 100644
--- a/java/jakarta/el/LocalStrings.properties
+++ b/java/jakarta/el/LocalStrings.properties
@@ -29,7 +29,7 @@ expressionFactory.readFailed=Failed to read [{0}]
 importHandler.ambiguousImport=The class [{0}] could not be imported as it 
conflicts with [{1}] which has already been imported
 importHandler.ambiguousStaticImport=The static import [{0}] could not be 
processed as it conflicts with [{1}] which has already been imported
 importHandler.classNotFound=The class [{0}] could not be imported as it could 
not be found
-importHandler.invalidClass=The class [{0}] must be public, non-abstract, not 
an interface and (for Java 9+) in an exported package
+importHandler.invalidClass=The class [{0}] must be public, in an exported 
package (for Java 9+), non-abstract and not an interface
 importHandler.invalidClassName=Name of class to import [{0}] must include a 
package
 importHandler.invalidClassNameForStatic=The class [{0}] specified for static 
import [{1}] is not valid
 importHandler.invalidStaticName=Name of static method or field to import [{0}] 
must include a class
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 17a0ace..2443f05 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -212,8 +212,8 @@ jsp.error.tagdirective.badbodycontent=Invalid body-content 
[{0}] in tag directiv
 jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
 jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with 
"/WEB-INF/tags" or "/META-INF/tags"
 jsp.error.tagfile.missingPath=Path not specified to tag file
-jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in 
line [{1}] and whose name attribute is [{0}], the value of this 
name-from-attribute attribute) must be of type java.lang.String, is "required" 
and not a "rtexprvalue".
-jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name attribute with a value [{0}], the value of this name-from-attribute 
attribute.
+jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at 
line [{1}] with name [{0}] that matches the name-from-attribute value of this 
variable directive must be of type java.lang.String, must be "required" and 
must not be a "rtexprvalue".
+jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with 
a name [{0}] that matches the name-from-attribute value of this variable 
directive
 jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in 
line [{2}] are the same.
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] 
cannot be resolved in either web.xml or the jar files deployed with this 
application
 jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64259] Cannot precompile jsps with jetty-jspc-maven-plugin since 8.5.51

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64259

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
Thanks. This is an issue for Jetty then. It looks to be related to the fixes
made to the ServiceLoader lookup.

-- 
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 64259] Cannot precompile jsps with jetty-jspc-maven-plugin since 8.5.51

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64259

--- Comment #1 from Marek Neumann  ---
I found out that adding an explicit tomcat-jasper dependency to the plugin
definition solves the issue. I assume that the jetty plugin uses an older
jasper compiler version which is also indicated by the error.

-- 
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

Tomcat Version 7.0.100: Service Loader no logging statements

[Christopher O'Connell]

I apologize if I'm not responding correctly to the thread. I'm new to the
distro and couldn't find anything to tell me how to respond.

I agree that we shouldn't add useless output. I've worked on projects where
there has been too much output.

My concern is that there is nothing to indicate the WebAppServiceLoader was
working. I know it is not the responsibility of Tomcat to get my
application running. If there was something to indicate that Tomcat had
failed to load my applications I wouldn't habe had to debug it and a fix
could've been done faster. If the official response is to hook up a
debugger and figure out the problem then the output is not needed.

The output I'm proposing is small and will be at a high enough verbosity
that it won't be on all the time. As I said before, I can submit a fix.

Thanks,

Chris

[tomcat] 03/03: Expand Chinese translations.

[markt]

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 1cc0f59bc82c9bd8f254cc2deb184a8a1ca041ce
Author: Mark Thomas 
AuthorDate: Fri Mar 27 10:54:34 2020 +

Expand Chinese translations.
---
 .../catalina/authenticator/LocalStrings_zh_CN.properties|  3 +++
 .../apache/catalina/connector/LocalStrings_zh_CN.properties |  5 +
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 13 +
 .../apache/catalina/deploy/LocalStrings_zh_CN.properties|  1 +
 .../jmx => ha/context}/LocalStrings_zh_CN.properties|  3 +--
 .../apache/catalina/ha/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/ha/session/LocalStrings_zh_CN.properties   |  5 +
 .../apache/catalina/ha/tcp/LocalStrings_zh_CN.properties|  4 
 .../apache/catalina/loader/LocalStrings_zh_CN.properties|  3 +++
 .../apache/catalina/manager/LocalStrings_zh_CN.properties   |  2 ++
 .../org/apache/catalina/realm/LocalStrings_zh_CN.properties |  7 +++
 .../apache/catalina/servlets/LocalStrings_zh_CN.properties  |  2 ++
 .../apache/catalina/session/LocalStrings_zh_CN.properties   |  6 ++
 .../apache/catalina/startup/LocalStrings_zh_CN.properties   |  6 ++
 .../catalina/tribes/group/LocalStrings_zh_CN.properties |  2 ++
 .../tribes/group/interceptors/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/tribes/jmx/LocalStrings_zh_CN.properties   |  1 +
 .../tribes/membership/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/tribes/tipis/LocalStrings_zh_CN.properties |  4 
 .../tribes/transport/nio/LocalStrings_zh_CN.properties  |  3 +++
 .../org/apache/catalina/users/LocalStrings_zh_CN.properties |  2 ++
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties |  1 +
 .../apache/catalina/valves/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/webresources/LocalStrings_zh_CN.properties |  6 ++
 java/org/apache/coyote/LocalStrings_zh_CN.properties|  6 ++
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties|  4 
 java/org/apache/coyote/http11/LocalStrings_zh_CN.properties |  3 +++
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties  |  3 +++
 .../apache/jasper/resources/LocalStrings_zh_CN.properties   |  8 
 java/org/apache/tomcat/util/LocalStrings_zh_CN.properties   |  1 +
 .../apache/tomcat/util/compat/LocalStrings_zh_CN.properties |  1 +
 .../util/descriptor/web/LocalStrings_zh_CN.properties   |  1 +
 .../tomcat/util/http/parser/LocalStrings_zh_CN.properties   |  1 +
 .../apache/tomcat/util/net/LocalStrings_zh_CN.properties|  9 +
 .../tomcat/util/net/jsse/LocalStrings_zh_CN.properties  |  2 ++
 .../tomcat/util/net/openssl/LocalStrings_zh_CN.properties   |  2 ++
 .../util/threads/res}/LocalStrings_zh_CN.properties |  3 +--
 .../apache/tomcat/websocket/LocalStrings_zh_CN.properties   |  6 ++
 webapps/docs/changelog.xml  |  4 
 39 files changed, 138 insertions(+), 4 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index c2daba3..5545b03 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -35,6 +35,7 @@ basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
 digestAuthenticator.cacheRemove=已从客户端 nonce 
缓存中删除有效条目，以便为新条目腾出空间。重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增加nonceCacheSize。此类型的进一步警告将被抑制5分钟。
 
 formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
+formAuthenticator.noLoginPage=在环境[{0}]中，未为FORM认证定义登录页面
 
 singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
 singleSignOn.debug.cookieCheck=SSO检查SSO cookie
@@ -44,8 +45,10 @@ singleSignOn.debug.hasPrincipal=找到以前经过身份验证的主体[{0}]
 singleSignOn.debug.invoke=SSO为[{0}]处理请求
 singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
 singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
+singleSignOn.debug.principalNotFound=SSO未找到缓存的Principal，为会话[{0}]擦除SSO cookie
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
 singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
+singleSignOn.sessionExpire.contextNotFound=SSO无法中止[{0}]，因为Context未找到
 singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效
 singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异常，导致单点登录无法使会话[{0}]失效
 singleSignOn.sessionExpire.managerNotFound=SSO无法使会话[{0}]过期，因为找不到管理器
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index c7207b4..c024ad6 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -34,6 +34,7 @@ coyoteRequest.authenticate.is

[tomcat] branch master updated (4e141ec -> 1cc0f59)

[markt]

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 4e141ec  Fix consistency issues after the changes
 new bd42058  Fix deprecation warnings with newer JUnit 4 in 2020.03 
Eclipse IDE
 new 0c6fdd2  Update French translations
 new 1cc0f59  Expand Chinese translations.

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


Summary of changes:
 java/jakarta/el/LocalStrings_fr.properties|  6 +++---
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../authenticator/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/connector/LocalStrings_zh_CN.properties  |  5 +
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/core/LocalStrings_zh_CN.properties   | 13 +
 .../catalina/deploy/LocalStrings_zh_CN.properties |  1 +
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../LocalStrings_zh_CN.properties |  2 +-
 .../catalina/ha/deploy/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/ha/session/LocalStrings_zh_CN.properties |  5 +
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties |  4 
 .../catalina/loader/LocalStrings_zh_CN.properties |  3 +++
 .../catalina/manager/LocalStrings_zh_CN.properties|  2 ++
 .../catalina/realm/LocalStrings_zh_CN.properties  |  7 +++
 .../catalina/servlets/LocalStrings_zh_CN.properties   |  2 ++
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/session/LocalStrings_zh_CN.properties|  6 ++
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../catalina/startup/LocalStrings_zh_CN.properties|  6 ++
 .../tribes/group/LocalStrings_zh_CN.properties|  2 ++
 .../group/interceptors/LocalStrings_fr.properties |  4 ++--
 .../group/interceptors/LocalStrings_zh_CN.properties  |  3 +++
 .../catalina/tribes/jmx/LocalStrings_zh_CN.properties |  1 +
 .../tribes/membership/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  8 
 .../tribes/tipis/LocalStrings_zh_CN.properties|  4 
 .../tribes/transport/LocalStrings_fr.properties   |  2 +-
 .../transport/nio/LocalStrings_zh_CN.properties   |  3 +++
 .../catalina/users/LocalStrings_zh_CN.properties  |  2 ++
 .../catalina/util/LocalStrings_zh_CN.properties   |  1 +
 .../catalina/valves/LocalStrings_zh_CN.properties |  2 ++
 .../webresources/LocalStrings_zh_CN.properties|  6 ++
 java/org/apache/coyote/LocalStrings_fr.properties |  4 ++--
 java/org/apache/coyote/LocalStrings_zh_CN.properties  |  6 ++
 .../apache/coyote/ajp/LocalStrings_zh_CN.properties   |  4 
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/LocalStrings_zh_CN.properties   |  3 +++
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties|  2 +-
 .../apache/coyote/http2/LocalStrings_zh_CN.properties |  3 +++
 .../jasper/resources/LocalStrings_fr.properties   | 16 
 .../jasper/resources/LocalStrings_zh_CN.properties|  8 
 .../apache/tomcat/util/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/compat/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../util/descriptor/web/LocalStrings_zh_CN.properties |  1 +
 .../tomcat/util/http/LocalStrings_fr.properties   |  9 -
 .../util/http/parser/LocalStrings_fr.properties   |  2 +-
 .../util/http/parser/LocalStrings_zh_CN.properties|  1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties |  9 +
 .../util/net/jsse/LocalStrings_zh_CN.properties   |  2 ++
 .../util/net/openssl/LocalStrings_fr.properties   |  3 ++-
 .../util/net/openssl/LocalStrings_zh_CN.properties|  2 ++
 .../util/threads/res}/LocalStrings_zh_CN.properties   |  2 +-
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties|  6 ++
 .../org/apache/catalina/core/TestStandardContext.java |  3 ++-
 .../group/interceptors/TestEncryptInterceptor.java|  3 ++-
 .../valves/rewrite/TestQuotedStringTokenizer.java |  8 
 test/org/apache/coyote/http2/TestHttp2Limits.java |  5 +++--
 .../tomcat/util/net/openssl/TestOpenSSLConf.java  |  5 +++--
 webapps/docs/changelog.xml| 12 
 .../WEB-INF/classes/LocalStrings_fr.properties|  2 +-
 65 files changed, 213 insertions(+), 61 deletions(-)
 copy java/org/apache/catalina/ha/{backend =

[tomcat] 01/03: Fix deprecation warnings with newer JUnit 4 in 2020.03 Eclipse IDE

[markt]

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 bd42058e37c6239cfa1dae90a637e018ab62f8ea
Author: Mark Thomas 
AuthorDate: Fri Mar 27 09:37:51 2020 +

Fix deprecation warnings with newer JUnit 4 in 2020.03 Eclipse IDE
---
 test/org/apache/catalina/core/TestStandardContext.java| 3 ++-
 .../tribes/group/interceptors/TestEncryptInterceptor.java | 3 ++-
 .../apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java | 8 
 test/org/apache/coyote/http2/TestHttp2Limits.java | 5 +++--
 test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java  | 5 +++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardContext.java 
b/test/org/apache/catalina/core/TestStandardContext.java
index f7e5793..b28905a 100644
--- a/test/org/apache/catalina/core/TestStandardContext.java
+++ b/test/org/apache/catalina/core/TestStandardContext.java
@@ -46,6 +46,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -972,7 +973,7 @@ public class TestStandardContext extends TomcatBaseTest {
 Context context = new StandardContext();
 
 context.setResourceOnlyServlets("a,b,c");
-
Assert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
+
MatcherAssert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
 CoreMatchers.hasItems("a", "b", "c"));
 }
 
diff --git 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
index 5b76df7..172ca20 100644
--- 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
+++ 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 
 import javax.crypto.Cipher;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
 
@@ -371,7 +372,7 @@ public class TestEncryptInterceptor {
 
 byte[] cipherText2 = 
((ValueCaptureInterceptor)src.getNext()).getValue();
 
-Assert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
+MatcherAssert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
 cipherText1, IsNot.not(IsEqual.equalTo(cipherText2)));
 }
 
diff --git 
a/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java 
b/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
index ec228ae..2104155 100644
--- a/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
+++ b/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
@@ -23,8 +23,8 @@ import java.util.Collections;
 import java.util.List;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -60,12 +60,12 @@ public class TestQuotedStringTokenizer {
 List result = new ArrayList<>();
 int count = tokens.size();
 while (tokenizer.hasMoreTokens()) {
-Assert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(count)));
+MatcherAssert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(count)));
 result.add(tokenizer.nextToken());
 count--;
 }
-Assert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(0)));
-Assert.assertThat(tokens, CoreMatchers.is(result));
+MatcherAssert.assertThat(Integer.valueOf(tokenizer.countTokens()), 
CoreMatchers.is(Integer.valueOf(0)));
+MatcherAssert.assertThat(tokens, CoreMatchers.is(result));
 }
 
 }
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index d3ad8c8..69f6438 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Random;
 
 import org.hamcrest.Description;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.TypeSafeMatcher;
 
 import org.junit.Assert;
@@ -265,7 +266,7 @@ public class TestHttp2Limits extends Http2TestBase {
 //   above.
 try {
 parser.readFrame(true);
-Assert.assertThat(output.getTrace(), RegexMatcher.matchesRegex(
+MatcherAssert.assertThat(output.getTrace(), 
RegexMatcher.matchesRegex(

[tomcat] 02/03: Update French translations

[markt]

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 0c6fdd21768f19504d0d98d4b81276b27144a9d8
Author: Mark Thomas 
AuthorDate: Fri Mar 27 10:48:56 2020 +

Update French translations
---
 java/jakarta/el/LocalStrings_fr.properties|  6 +++---
 .../catalina/authenticator/LocalStrings_fr.properties |  2 +-
 .../apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 .../catalina/filters/LocalStrings_fr.properties   |  2 +-
 .../catalina/ha/session/LocalStrings_fr.properties|  4 ++--
 .../catalina/session/LocalStrings_fr.properties   |  4 +++-
 .../catalina/startup/LocalStrings_fr.properties   | 19 ++-
 .../group/interceptors/LocalStrings_fr.properties |  4 ++--
 .../catalina/tribes/tipis/LocalStrings_fr.properties  |  8 
 .../tribes/transport/LocalStrings_fr.properties   |  2 +-
 java/org/apache/coyote/LocalStrings_fr.properties |  4 ++--
 .../apache/coyote/http11/LocalStrings_fr.properties   |  5 +++--
 .../coyote/http11/filters/LocalStrings_fr.properties  |  2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties|  2 +-
 .../jasper/resources/LocalStrings_fr.properties   | 16 
 .../tomcat/util/descriptor/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/http/LocalStrings_fr.properties   |  9 -
 .../util/http/parser/LocalStrings_fr.properties   |  2 +-
 .../util/net/openssl/LocalStrings_fr.properties   |  3 ++-
 .../tomcat/websocket/LocalStrings_fr.properties   |  2 +-
 webapps/docs/changelog.xml|  8 
 .../WEB-INF/classes/LocalStrings_fr.properties|  2 +-
 22 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/java/jakarta/el/LocalStrings_fr.properties 
b/java/jakarta/el/LocalStrings_fr.properties
index 5057d0c..0ff73f7 100644
--- a/java/jakarta/el/LocalStrings_fr.properties
+++ b/java/jakarta/el/LocalStrings_fr.properties
@@ -29,9 +29,9 @@ expressionFactory.readFailed=Impossible de lire [{0}]
 importHandler.ambiguousImport=La classe [{0}] n''a pas pu être importée car 
elle entre en conflit avec [{1}] qui a déjà été importée
 importHandler.ambiguousStaticImport=L''import statique [{0}] ne peut pas être 
traité parce qu''il est en conflit avec [{1}] qui a déjà été importé
 importHandler.classNotFound=La classe [{0}] n''a pu être importée, vu qu''on 
ne l''a pas trouvée
-importHandler.invalidClass=La classe [{0}] doit être publique, non abstraite, 
et ne pas être une interface
+importHandler.invalidClass=La classe [{0}] doit être publique, non abstraite, 
ne pas être une interface et (pour Java 9+) être dans un package exporté
 importHandler.invalidClassName=Le nom de la classe à importer [{0}] doit 
comprendre un paquet
-importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour 
l''importation statique [{1}] n''est pas valide
+importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour 
l''import statique [{1}] n''est pas valide
 importHandler.invalidStaticName=Le nom de la méthode statique ou champ à 
importer [{0}] doit inclure une calsse
 importHandler.staticNotFound=L''importation statique [{0}] n''a pas été 
trouvée dans la classe [{1}] pour [{2}]
 
@@ -45,7 +45,7 @@ propertyReadError=Erreur lors de la lecture de [{1}] sur le 
type [{0}]
 propertyWriteError=Erreur d''écriture [{1}] sur le type [{0}]
 
 staticFieldELResolver.methodNotFound=Aucune méthode publique et statique 
nommée [{0}] n''a été trouvée dans la classe [{1}]
-staticFieldELResolver.notFound=Un champ statique et public nommé [{0}] n''a 
pas pu être trouvé sur la classe [{1}]
+staticFieldELResolver.notFound=Aucun champ public statique nommé [{0}] n''a 
été trouvé dans la classe [{1}] (exportée pour Java 9+)
 staticFieldELResolver.notWriteable=L''écriture dans les champs statiques 
(champ [{0}] dans la classe [{1}] dans le cas présent) est interdite
 
 util.method.ambiguous=Impossible de trouver une méthode non ambiguë: 
{0}.{1}({2})
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index d775459..363be09 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -61,7 +61,7 @@ singleSignOn.debug.sessionTimeout=Le SSO traite un timeout 
pour la session SSO [
 singleSignOn.debug.update=Le SSO met à jour la session SSO [{0}] avec le type 
d''authentification [{1}]
 singleSignOn.sessionExpire.contextNotFound=Le SSO n''a pu faire expirer la 
session [{0}] parce que le contexte n''a pas été trouvé
 singleSignOn.sessionExpire.engineNull=Le SSO n''a pu faire expirer la session 
[{0}] parce que le moteur est null
-singleSignOn.sessionExpire.hostNotFound=SSO ne peut pas expirer le session 
[{0}] parce l''hôte ("Host") n''a a pas été trouvé

Re: sources repository for taglibs-standard-impl/specs-1.2.5-migrated-0.0.1

[Mark Thomas]

On 27/03/2020 04:58, Olivier Lamy wrote:
> Hi
> We have to move this https://svn.apache.org/repos/asf/tomcat/taglibs/ 
> to git.
> As it's few separate Maven projects, maybe we could create one git repo
> per project: 
> - https://github.com/apache/tomcat-taglibs-site
> - https://github.com/apache/tomcat-taglibs-standard (standard-examples
> can be integrated in standard source tree but not part of the release
> just here for documentation purpose)
> - https://github.com/apache/tomcat-taglibs-parent
> 
> - https://github.com/apache/tomcat-taglibs can contain some modules to
> ease clone of only git repo (or maybe we simply put the site here) I
> don't have strong opinion for this
> 
> Do we still need rdc?

The above seems reasonable to me but I have never worked on taglibs so
my opinion shouldn't count for much.

> during the migration each tags/branches (if any) will be integrated in
> the created git repo

This is the bit that interests me. I know from experience with previous
Tomcat projects that the svn -> git migration for a project that has
previously gone through an cvs -> svn migration is very slow. It took
over a week to process the Tomcat Connectors project. This is because
the migration tool ends up searching back through the history repeatedly
for each tag.

I might be able to help put by running the migration directly on one of
the ASF servers. I'll need to talk to infra if we want to try that route.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix consistency issues after the changes

[remm]

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

remm 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 4e141ec  Fix consistency issues after the changes
4e141ec is described below

commit 4e141ec4b963d2b8218b45d9b81ad3475a83001f
Author: remm 
AuthorDate: Fri Mar 27 10:48:31 2020 +0100

Fix consistency issues after the changes
---
 webapps/docs/config/systemprops.xml | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index 279f43f..a7cfac8 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -281,17 +281,19 @@
 
 
   The default value of this system property is false.
-  If this is true the default values will be changed 
for:
+  If this is true the default values will be changed
+  to true instead of false for:
   
-  
org.apache.catalina.Context.alwaysAccessSession
-  
org.apache.catalina.Context.contextGetResourceRequiresSlash
-  
org.apache.catalina.Context.dispatcherWrapsSameObject
-  
org.apache.catalina.Manager.sessionActivityCheck
-  
org.apache.catalina.Manager.sessionLastAccessAtStart
   
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING
   The URIEncoding attribute of any
   HTTP connector or
   AJP connector element.
+  The alwaysAccessSession attribute of any
+  Context element.
+  The contextGetResourceRequiresSlash attribute of any
+  Context element.
+  The dispatcherWrapsSameObject attribute of any
+  Context element.
   The resourceOnlyServlets attribute of any
   Context element.
   The tldValidation attribute of any
@@ -302,15 +304,19 @@
   Context element.
   The xmlValidation attribute of any
   Context element.
+  The sessionActivityCheck attribute of any
+  Manager element.
+  The sessionLastAccessAtStart attribute of any
+  Manager element.
   
 
 
 
   The default value of this system property is false.
-  If this is true the default values will be changed 
for:
+  If this is true the default values will be changed
+  to true instead of false for:
   
-
org.apache.tomcat.websocket.server#isEnforceNoAddAfterHandshake
-(default changes from false to true)
+
org.apache.tomcat.websocket.server.WsServerContainer#isEnforceNoAddAfterHandshake
   
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1875768 - in /tomcat/site/trunk: docs/security-9.html xdocs/security-9.xml

[markt]

Author: markt
Date: Fri Mar 27 09:13:37 2020
New Revision: 1875768

URL: http://svn.apache.org/viewvc?rev=1875768&view=rev
Log:
Correct date of 9.0.31 release

Modified:
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-9.xml

Modified: tomcat/site/trunk/docs/security-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1875768&r1=1875767&r2=1875768&view=diff
==
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Fri Mar 27 09:13:37 2020
@@ -39,7 +39,7 @@
Tomcat Security Team. Thank you.
 
 
-  11 
February 2019 Fixed in Apache Tomcat 9.0.31
+  11 
February 2020 Fixed in Apache Tomcat 9.0.31
 
 High: AJP Request Injection and potential Remote Code 
Execution
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-1938"; 
rel="nofollow">CVE-2020-1938

Modified: tomcat/site/trunk/xdocs/security-9.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-9.xml?rev=1875768&r1=1875767&r2=1875768&view=diff
==
--- tomcat/site/trunk/xdocs/security-9.xml (original)
+++ tomcat/site/trunk/xdocs/security-9.xml Fri Mar 27 09:13:37 2020
@@ -50,7 +50,7 @@
 
   
 
-  
+  
 
 High: AJP Request Injection and potential Remote Code 
Execution
CVE-2020-1938



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat Version 7.0.100: Service Loader no logging statements

[Martin Grigorov]

Hi,

On Thu, Mar 26, 2020 at 11:23 PM Rémy Maucherat  wrote:

> On Thu, Mar 26, 2020 at 9:16 PM Christopher O'Connell <
> coconnel...@gmail.com> wrote:
>
>> The Tomcat release version 7.0.100 introduced a bug that prevented
>> ServiceLoaders from being started. This was fixed by the ticket:
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=64191 (Thank you for
>> the fix)
>>
>> This problem ended up causing an application I was working on from
>> running correctly. In an attempt to resolve, I tried turning up
>> logging but there does not appear to be any logging in this section of
>> the code, error or otherwise.
>>
>> Would it be possible to add additional logging, specifically in the
>> WebappServiceLoader.java class? I'd be willing to submit code to
>> address this concern.
>>
>
> -1
> Adding useless verbose logging just to reassure you that there's no bug in
> the container is quite pointless. SCI processing is not something that is
> complex, and if your SCI is found you can log there.
>

The benefit of having the log statement (as DEBUG) in Tomcat's code base is
that the developer can see all SCI impls being used in the application, not
just "mine SCI".
And often "mine SCI" is not really mine but provided by some web framework
like Spring MVC, RestEasy, etc. If those have their own log statements then
I could enable them one by one. But it is possible that they won't have
such too.
Is there any harm of having such log statement in Tomcat ? It loads those
classes at application start time so it is not a hot path.

My 2c.
Martin


>
> Rémy
>
>
>>
>> Thanks,
>>
>> Chris
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>