date:20181218

[Bug 63014] New: Tomcat 9 throws exception when sending unencoded charecters in QueryString

2018-12-18 Thread bugzilla

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

Bug ID: 63014
   Summary: Tomcat 9 throws exception when sending unencoded
charecters in QueryString
   Product: Tomcat 9
   Version: 9.0.13
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: major
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: melvind...@gmail.com
  Target Milestone: -

Created attachment 36333
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36333&action=edit
Tomcat 9.0.13

I switched from tomcat 8.5.35 to 9.0.13. In 8.5 when I send an unencoded
character in queryString it throws 400 error in the browser itself and no
Exception is thrown or seen explicitly.

After I switched to tomcat 9, when I send an unencoded character in queryString
it throws Exception and tomcat error page is shown. I configured error-page in
both the servers. 

I know that these characters can be relaxed by adding them in relaxedquerychars
in server.xml. But still it is a 400 error and ideally it must redirect me to
the configured error page.

Also when the response.setStatus(400) is called, error page is not redirected
in both the servers.

web.xml -


  
400
/error.jsp
  
  
500
/error.jsp
  



URL=http://localhost:9013/app1/paramTest.jsp?name=^
Tomcat 8.5.32 - 'This page isn’t working' is shown in browser.
Tomcat 9.0.13 - java.lang.IllegalArgumentException: Invalid character found in
the request target. The valid characters are defined in RFC 7230 and RFC 3986
   
org.apache.coyote.http11.Http11InputBuffer.parseRequestLine(Http11InputBuffer.java:467)
   
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:294)
   
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)
   
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:791)
   
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1417)
   
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
   
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
   
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
   
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
java.lang.Thread.run(Thread.java:748)

is thrown and tomcat error page is shown. I have attached the screenshot of the
exception thrown. Do the needful.

Regards,
Melvin A

-- 
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 63014] Tomcat 9 throws exception when sending unencoded charecters in QueryString

2018-12-18 Thread bugzilla

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

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #1 from Remy Maucherat  ---
The exception is very explicit about the cause. The error occurs when the HTTP
request is parsed, long before it is mapped, and it will not be mapped to
anything since the URL is considered invalid. As a result, the error page of
your application will not be found.

Please post on the Tomcat user mailing list first for this kind of problem.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Why tomcat not prevent concurrent requests from same session

2018-12-18 Thread Mark Thomas

On 18/12/2018 07:00, jianjun.guo wrote:
> When one web page contains twice and more pages.
> Sometime there are simultaneous requests which same session in tomcat.
> Image that these page modify the session.
> The session will be  in confusion??
> Will we consider making the session exclusive access

No.

See section 7.7.1 of the Servlet 4 specification. In particular the
sentence starting "The Developer has the responsibility..."

Mark


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

Re: [VOTE] Release Apache Tomcat 8.5.37

2018-12-18 Thread Mark Thomas

On 18/12/2018 00:03, Emmanuel Bourg wrote:



> I've tested on Debian Sid with OpenJDK 11.0.1+13 and OpenSSL 1.1.1a, and
> I've noticed two test failures in TestClientCertTls13 with the three
> connectors. Is this expected?

No.

It looks like a fix to the tests didn't get back-ported correctly. I'll
get that fixed. Only the tests should be affected so I'm not planning to
re-roll the release.

Mark


> 
> Testcase: testClientCertPost took 0.77 sec
> Caused an ERROR
> Received fatal alert: protocol_version
> javax.net.ssl.SSLHandshakeException: Received fatal alert: protocol_version
> at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:128)
> at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
> at 
> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:308)
> at 
> java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:279)
> at 
> java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:181)
> at 
> java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:164)
> at 
> java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1152)
> at 
> java.base/sun.security.ssl.SSLSocketImpl.readHandshakeRecord(SSLSocketImpl.java:1063)
> at 
> java.base/sun.security.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:402)
> at 
> java.base/sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:567)
> at 
> java.base/sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:185)
> at 
> java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.connect(HttpsURLConnectionImpl.java:163)
> at 
> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:782)
> at 
> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:748)
> at 
> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:722)
> at 
> org.apache.tomcat.util.net.TestClientCertTls13.testClientCertPost(TestClientCertTls13.java:61)
> at 
> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at 
> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at 
> java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> 
> Testcase: testClientCertGet took 0.038 sec
> Caused an ERROR
> Received fatal alert: protocol_version
> javax.net.ssl.SSLHandshakeException: Received fatal alert: protocol_version
> at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:128)
> at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
> at 
> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:308)
> at 
> java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:279)
> at 
> java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:181)
> at 
> java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:164)
> at 
> java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1152)
> at 
> java.base/sun.security.ssl.SSLSocketImpl.readHandshakeRecord(SSLSocketImpl.java:1063)
> at 
> java.base/sun.security.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:402)
> at 
> java.base/sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:567)
> at 
> java.base/sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:185)
> at 
> java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.connect(HttpsURLConnectionImpl.java:163)
> at 
> org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:689)
> at 
> org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:663)
> at 
> org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:657)
> at 
> org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:651)
> at 
> org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:636)
> at 
> org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:630)
> at 
> org.apache.tomcat.util.net.TestClientCertTls13.testClientCertGet(TestClientCertTls13.java:45)
> at 
> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at 
> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
> at 
> java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-

svn commit: r1849161 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 11:03:51 2018
New Revision: 1849161

URL: http://svn.apache.org/viewvc?rev=1849161&view=rev
Log:
Fix failing test for NIO and NIO2 when Java 11 is used

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1849161&r1=1849160&r2=1849161&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Tue 
Dec 18 11:03:51 2018
@@ -112,7 +112,7 @@ public final class TesterSupport {
 String keystorePass, String keyPass) {
 
 String protocol = tomcat.getConnector().getProtocolHandlerClassName();
-if (protocol.indexOf("Apr") == -1) {
+if (!protocol.contains("Apr")) {
 Connector connector = tomcat.getConnector();
 String sslImplementation = 
System.getProperty("tomcat.test.sslImplementation");
 if (sslImplementation != null && 
!"${test.sslImplementation}".equals(sslImplementation)) {
@@ -180,7 +180,7 @@ public final class TesterSupport {
 
 protected static void configureClientSsl() {
 try {
-SSLContext sc = 
SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
+SSLContext sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
 sc.init(TesterSupport.getUser1KeyManagers(),
 TesterSupport.getTrustManagers(),
 null);
@@ -268,7 +268,7 @@ public final class TesterSupport {
 X509Certificate cert = 
(X509Certificate)ks.getCertificate(CA_ALIAS);
 clientAuthExpectedIssuer = cert.getSubjectDN().getName();
 } catch (Exception ex) {
-// Ignore
+throw new RuntimeException(ex);
 }
 
 String cn = "NOTFOUND";
@@ -277,7 +277,7 @@ public final class TesterSupport {
 X509Certificate cert = 
(X509Certificate)ks.getCertificate(CLIENT_ALIAS);
 cn = cert.getSubjectDN().getName();
 } catch (Exception ex) {
-// Ignore
+throw new RuntimeException(ex);
 }
 
 realm.addUser(cn, "not used");



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

svn commit: r1849168 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 11:29:28 2018
New Revision: 1849168

URL: http://svn.apache.org/viewvc?rev=1849168&view=rev
Log:
Update test keys and certs to use new CA hierarchy that has a longer key (4096 
bits) for the CA and more complete DNs. Fixes APR test failure with Java 11

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca.jks
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/keystore-info.txt
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost.jks
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/user1.jks

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 18 11:29:28 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,17

buildbot failure in on tomcat-85-trunk

2018-12-18 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-85-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1582

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.5.x/trunk] 1849161
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1849169 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/ca.jks

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 11:46:14 2018
New Revision: 1849169

URL: http://svn.apache.org/viewvc?rev=1849169&view=rev
Log:
Change alias name from 'mykey' to 'ca'.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca.jks

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 18 11:46:14 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763

Re: [VOTE] Release Apache Tomcat 8.5.37

2018-12-18 Thread Mark Thomas

On 12/12/2018 13:22, Mark Thomas wrote:
> The proposed 8.5.37 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.37

Unit tests passed for NIO, NIO2 and APR/native on OSX, Linux and Windows
with Tomcat Native 1.2.19 built with APR 1.6.5 and OpenSSL 1.1.1a

Mark

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

[VOTE][RESULT] Release Apache Tomcat 8.5.37

2018-12-18 Thread Mark Thomas

The following votes were cast:

Binding:
+1: fschumacher, schultz, markt

Non-binding:
+1: isapir


Note: ebourg reported test failures with Java 11. These were traced to a
  bug in the test suite.


The vote therefore passes. Thanks to everyone who contributed to this
release.

Mark

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

svn commit: r31590 - /dev/tomcat/tomcat-8/v8.5.37/ /release/tomcat/tomcat-8/v8.5.37/

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 12:24:06 2018
New Revision: 31590

Log:
Release 8.5.37

Added:
release/tomcat/tomcat-8/v8.5.37/
  - copied from r31589, dev/tomcat/tomcat-8/v8.5.37/
Removed:
dev/tomcat/tomcat-8/v8.5.37/


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

svn commit: r1849171 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 12:25:00 2018
New Revision: 1849171

URL: http://svn.apache.org/viewvc?rev=1849171&view=rev
Log:
Add 8.5.37 release date

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1849171&r1=1849170&r2=1849171&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Dec 18 12:25:00 2018
@@ -55,7 +55,7 @@
 
   
 
-
+
   
 
   



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

[Bug 63003] Tomcat is closing async connection prematurely when shutdown is initiated.

2018-12-18 Thread bugzilla

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

--- Comment #2 from Mark Thomas  ---
Created attachment 36335
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36335&action=edit
Proposed fix for Tomcat 9.0.x v1

This is going to be a little trickier to solve than might be expected. The main
cause of the complication is that there isn't a simple mapping between web
applications and in-flight async requests.

There are other complications:
- requests can move between sync and async multiple times during their
execution
- the unload delay is currently applied to each Servlet in turn

The proposed solution attempts to solve this by:
- providing a mechanism for the timeout task to timeout any async requests for
stopped web apps
- tracking the number of in-flight async requests per web application so that
the web application stop process can be paused (for up to unloadDelay
milliseconds) to allow those asyncRequests to complete

Async requests that continue past the unload delay will be timed out. Given
that the web application may have been stopped by that point, the timeout is
likely to experience exceptions.

I'm providing this patch to solicit feedback. I'll probably come back to this
after the holidays.

My current expectation is that this would be back-ported to 7.0.x and 8.5.x.

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

svn commit: r1849222 - in /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net: TesterSupport.java jsse/TesterBug50640SslImpl.java

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 20:11:13 2018
New Revision: 1849222

URL: http://svn.apache.org/viewvc?rev=1849222&view=rev
Log:
More work required to get the TLS tests to play nicely with Java 7 through 11 
(and hopefully beyond)

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1849222&r1=1849221&r2=1849222&view=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Tue 
Dec 18 20:11:13 2018
@@ -53,6 +53,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.tomcat.jni.Library;
 import org.apache.tomcat.jni.LibraryNotFoundError;
 import org.apache.tomcat.jni.SSL;
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.compat.TLS;
 import org.apache.tomcat.util.descriptor.web.LoginConfig;
 import org.apache.tomcat.util.descriptor.web.SecurityCollection;
@@ -238,10 +239,16 @@ public final class TesterSupport {
 /* When running on Java 11, TLSv1.3 is enabled by default. The JSSE
  * implementation of TLSv1.3 does not support
  * certificateVerification="optional", a setting on which these tests
- * depend. Therefore, force these tests to use TLSv1.2 so that they 
pass
- * when running on TLSv1.3.
+ * depend.
+ * Java 7 does not enable TLSv1.1 or TLS1.2 by default
+ *
+ * Ensure these tests pass with all JREs from Java 7 onwards.
  */
-tomcat.getConnector().setProperty("sslEnabledProtocols", 
Constants.SSL_PROTO_TLSv1_2);
+if (JreCompat.isJre8Available()) {
+tomcat.getConnector().setProperty("sslEnabledProtocols", 
Constants.SSL_PROTO_TLSv1_2);
+} else {
+tomcat.getConnector().setProperty("sslEnabledProtocols", 
Constants.SSL_PROTO_TLSv1);
+}
 
 // Need a web application with a protected and unprotected URL
 // No file system docBase required

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java?rev=1849222&r1=1849221&r2=1849222&view=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java
 Tue Dec 18 20:11:13 2018
@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net.jsse;
 
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.net.Constants;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
@@ -32,7 +33,11 @@ public class TesterBug50640SslImpl exten
 SSLHostConfig sslHostConfig = certificate.getSSLHostConfig();
 if (sslHostConfig.getProtocols().size() == 1 &&
 sslHostConfig.getProtocols().contains(PROPERTY_VALUE)) {
-sslHostConfig.setProtocols(Constants.SSL_PROTO_TLSv1_2);
+if (JreCompat.isJre8Available()) {
+sslHostConfig.setProtocols(Constants.SSL_PROTO_TLSv1_2);
+} else {
+sslHostConfig.setProtocols(Constants.SSL_PROTO_TLSv1);
+}
 return super.getSSLUtil(certificate);
 } else {
 return null;



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

buildbot success in on tomcat-85-trunk

2018-12-18 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1585

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.5.x/trunk] 1849222
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1849230 - in /tomcat/trunk/java/org/apache/catalina: core/LocalStrings_fr.properties ha/session/LocalStrings_fr.properties startup/LocalStrings_fr.properties tribes/membership/cloud/Local

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:02:30 2018
New Revision: 1849230

URL: http://svn.apache.org/viewvc?rev=1849230&view=rev
Log:
Import updates to French translations

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1849230&r1=1849229&r2=1849230&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
[UTF-8] Tue Dec 18 21:02:30 2018
@@ -73,7 +73,7 @@ aprListener.aprInitError=La librairie Ap
 aprListener.config=Configuration de APR/OpenSSL: useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.currentFIPSMode=Mode FIPS actuel: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener est configuré pour 
forcer le mode FIPS mais la librairie est déjà en mode FIPS [{0}]
-aprListener.flags=Capacités d''APR: Pv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}]
+aprListener.flags=Fonctionnalités d''APR: IPv6 [{0}], sendfile [{1}], accept 
filters [{2}], random [{3}]
 aprListener.initializeFIPSFailed=Echec d'entrée en mode FIPS
 aprListener.initializeFIPSSuccess=Entrée avec succès en mode FIPS
 aprListener.initializedOpenSSL=OpenSSL a été initialisé avec succès [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties?rev=1849230&r1=1849229&r2=1849230&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
Tue Dec 18 21:02:30 2018
@@ -39,7 +39,7 @@ deltaManager.noCluster=DÃ©marrage, pas
 deltaManager.noContextManager=Gestionnaire de session [{0}]: En rÃ©ponse Ã  
l''envoi de toutes les donnÃ©es de session Ã  [{0}], un message du gestionnaire 
de sessions correspondant Ã  Ã©tÃ© reÃ§u au bout de [{2}] ms
 deltaManager.noMasterMember=DÃ©marrage sans autre membre pour le contexte 
[{0}] du domaine [{1}]
 deltaManager.noMembers=Gestionnaire de session [{0}] : pas de transfert 
d''Ã©tat, il n''y a pas de membres actifs dans le cluster
-deltaManager.noSessionState=Gestionnaire de session [{0}] : pas de statut de 
session envoyÃ© Ã  [{1}] recu, timeout aprÃ¨s [{2}] ms.
+deltaManager.noSessionState=Gestionnaire de session [{0}] : pas de statut de 
session envoyÃ© Ã  [{1}] reÃ§u, dÃ©lai d''attente maximum de [{2}] ms.
 deltaManager.receiveMessage.accessed=Gestionnaire de session [{0}] : reÃ§u un 
accÃ¨s Ã  la session [{1}]
 deltaManager.receiveMessage.allSessionDataAfter=Gestionnaire de session [{0}] 
: l''Ã©tat de la session a Ã©tÃ© dÃ©sÃ©rialisÃ©
 deltaManager.receiveMessage.allSessionDataBegin=Gestionnaire de session [{0}] 
: : reÃ§u les donnÃ©es d''Ã©tat des sessions

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties?rev=1849230&r1=1849229&r2=1849230&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties 
[UTF-8] Tue Dec 18 21:02:30 2018
@@ -171,9 +171,9 @@ versionLoggerListener.env=Variable d’e
 versionLoggerListener.java.home=Répertoire de Java: {0}
 versionLoggerListener.os.arch=Architecture:  {0}
 versionLoggerListener.os.name=Nom de l''OS:   {0}
-versionLoggerListener.os.version=Version de l'OS:{0}
+versionLoggerListener.os.version=Version de l''OS:{0}
 versionLoggerListener.prop=Propriété système:   {0} = {1}
-versionLoggerListener.serverInfo.server.built=Serveur compilé:{0}
+versionLoggerListener.serverInfo.server.built=Serveur compilé:   {0}
 versionLoggerListener.serverInfo.server.number=Version du serveur:  {0}
 versionLoggerListener.serverInfo.server.version=Version du serveur:{0}
 versionLoggerListener.vm.vendor=Fournisseur de la JVM:{0}

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties?rev=1

svn commit: r1849231 - in /tomcat/trunk/java/org/apache: catalina/deploy/ catalina/ha/deploy/ catalina/ha/session/ catalina/tribes/membership/cloud/ tomcat/util/json/

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:03:21 2018
New Revision: 1849231

URL: http://svn.apache.org/viewvc?rev=1849231&view=rev
Log:
Import updates to Korean translations

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings_ko.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties?rev=1849231&r1=1849230&r2=1849231&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties Tue 
Dec 18 21:03:21 2018
@@ -19,7 +19,7 @@ namingResources.cleanupNoClose=ì»¨í�
 namingResources.cleanupNoContext=ì»¨íì´ë [{0}]ì(ë¥¼) ìí JNDI naming 
ì»¨íì¤í¸ë¥¼ ì¡°ííì§ ëª»íì¬ í´ë¹ ì»¨íì´ëë¥¼ ìí´ cleanupì´ 
ìíëì§ ìììµëë¤.
 namingResources.cleanupNoResource=ì»¨íì´í° [{1}]ë¥¼ ìí JNDI ë¦¬ìì¤ 
[{0}]ì(ë¥¼) ê²ìíì§ ëª»íì¬ í´ë¹ ë¦¬ìì¤ì ëí cleanupì 
ìííì§ ìììµëë¤.
 namingResources.ejbLookupLink=EJB ë í¼ë°ì¤ [{0}]ì(ë) ejb-linkì 
lookup-name ë ë¤ë¥¼ ì§ì íê² ë©ëë¤.
-namingResources.envEntryLookupValue=Environment ìí¸ë¦¬ [{0}]ì(ë) 
lookup-nameê³¼ ê° ë ëª¨ë ì§ì í´ì¼ í©ëë¤.
+namingResources.envEntryLookupValue=Environment ìí¸ë¦¬ [{0}]ì(ë) 
lookup-nameê³¼ ê° ë ëª¨ë ì§ì ëì´ ììµëë¤.
 namingResources.mbeanCreateFail=Naming ë¦¬ìì¤ [{0}]ì(ë¥¼) ìí MBeanì 
ìì±íì§ ëª»íìµëë¤.
 namingResources.mbeanDestroyFail=Naming ë¦¬ìì¤ [{0}]ë¥¼ ìí MBeanì 
ìë©¸ìí¤ì§ ëª»íìµëë¤.
 namingResources.resourceTypeFail=[{0}](ì´)ë¼ë ì´ë¦ì JNDI ë¦¬ìì¤ë 
íìì´ [{1}]ì´ì§ë§ í´ë¹ íìì í´ë¹ ë¦¬ìì¤ë¥¼ ìí´ ì¤ì ë 
injection ëì(ë¤)ì íì(ë¤)ê³¼ ì¼ê´ëì§ ììµëë¤.

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties?rev=1849231&r1=1849230&r2=1849231&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties 
Tue Dec 18 21:03:21 2018
@@ -49,7 +49,7 @@ fileMessageFactory.cannotRead=í´ë
 fileMessageFactory.cannotWrite=í´ë¹ í©í ë¦¬ê° ì½ê³  ìë ì¤ì´ë¼ì 
ë©ìì§ë¥¼ ì¸ ì ììµëë¤.
 fileMessageFactory.closed=í©í ë¦¬ê° ì´ë¯¸ ë«íìµëë¤.
 fileMessageFactory.deleteFail=[{0}]ì(ë¥¼) ìì íì§ ëª»íìµëë¤.
-fileMessageFactory.duplicateMessage=ì¤ë³µë ë©ìì§ë¥¼ ë°ììµëë¤. 
Senderì ActTimeoutì´ ëë¬´ ììµëë¤. ì»¨íì¤í¸: [{0}], íì¼ëª: 
[{1}], ë°ì´í°: [{2}], ë°ì´í° ê¸¸ì´: [{3}]
+fileMessageFactory.duplicateMessage=ì¤ë³µë ë©ìì§ë¥¼ ë°ììµëë¤. 
Senderì ì í ìê° ì´ê³¼ ê°ì´ ëë¬´ ìê² ì¤ì ëìëì? ì»¨í
ì¤í¸: [{0}], íì¼ëª: [{1}], ë°ì´í°: [{2}], ë°ì´í° ê¸¸ì´: [{3}]
 
 fileNewFail=[{0}]ì(ë¥¼) ìì±íì§ ëª»íìµëë¤.
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties?rev=1849231&r1=1849230&r2=1849231&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
Tue Dec 18 21:03:21 2018
@@ -69,7 +69,7 @@ deltaRequest.ssid.mismatch=ì¸ì
 deltaRequest.ssid.null=setSessionIdë¥¼ ìí ì¸ì IDê° ëìëë¤.
 deltaRequest.wrongPrincipalClass=í´ë¬ì¤í°ë§¤ëì ë ì¤ì§ 
GenericPrincipalë§ì ì§ìí©ëë¤. ì¬ì©ë realmì principal í´ëì¤ 
[{0}]ì(ë¥¼) ì¬ì©íê³  ììµëë¤.
 
-deltaSession.notifying=í´ë¬ì¤í°ì ì¸ì ë§ë£ë¥¼ íµì§í©ëë¤. 
primaryì¬ë¶: [{0}], ì¸ìID: [{1}].
+deltaSession.notifying=í´ë¬ì¤í°ì ì¸ì ë§ë£ë¥¼ íµì§í©ëë¤: 
primaryì¬ë¶: [{0}], ì¸ìID: [{1}]
 deltaSession.readSession=readObject()ê° ì¸ì [{0}]ì(ë¥¼) ë¡ëí©ëë¤.
 deltaSession.writeSession=writeObject()ê° ì¸ì [{0}]ì(ë¥¼) ì 
ì¥í©ëë¤.
 

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties

svn commit: r1849232 [3/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-18 Thread markt

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties?rev=1849232&r1=1849231&r2=1849232&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties 
[UTF-8] Tue Dec 18 21:05:29 2018
@@ -15,6 +15,7 @@
 
 accessLogValve.alreadyExists=[{0}]から[{1}]へのアクセスログの名前の変更に失敗しました。ファイルはすでに存在しています。
 accessLogValve.closeFail=アクセスログのクローズに失敗しました
+accessLogValve.deleteFail=古いアクセスログ[{0}]を削除できませんでした。
 accessLogValve.invalidLocale=[{0}] をロケールに設定できませんでした。
 accessLogValve.invalidPortType=不正なポート種類 [{0}] の代わりにサーバーのローカルポートを使用します？
 accessLogValve.openDirFail=アクセスログのディレクトリ[{0}]の作成に失敗しました
@@ -25,9 +26,12 @@ accessLogValve.unsupportedEncoding=文�
 accessLogValve.writeFail=ログメッセージ[{0}]の書き込みに失敗しました
 
 errorReportValve.description=説明
+errorReportValve.errorPageIOException=例外のため[{0}]にエラーページを表示できません。
 errorReportValve.errorPageNotFound=[{0}]に静的エラーページが見つかりません。
 errorReportValve.exception=例外
+errorReportValve.exceptionReport=例外報告
 errorReportValve.message=メッセージ
+errorReportValve.noDescription=説明はありません
 errorReportValve.note=注意
 errorReportValve.rootCause=根本原因
 errorReportValve.rootCauseInLogs=原因のすべてのスタックトレースは、サーバのログに記録されています
@@ -42,6 +46,7 @@ extendedAccessLogValve.emptyPattern=パ�
 extendedAccessLogValve.patternParseError=パターン文字列 [{0}] を解釈できませんでした。
 
 
http.400.desc=サーバは、クライアントエラー（例えば、不正なリクエスト構文、無効なリクエストメッセージフレーミング、または不正なリクエストルーティング）であると考えられるために、リクエストを処理できない、または処理しません。
+http.400.reason=Bad Request
 http.401.desc=リクエストには対象リソースの有効な認証資格がないため、適用されていません。
 http.401.reason=Unauthorized
 http.402.desc=このステータスコードは、将来の使用のために予約されています
@@ -56,6 +61,8 @@ http.406.desc=ターゲットリソー�
 http.406.reason=Not Acceptable
 
http.407.desc=このステータスコードは401（Unauthorized）に似ていますが、クライアントがプロキシを使用するために自身を認証する必要があることを示します。
 http.407.reason=プロキシ認証が必要です。
+http.408.desc=サーバーは、待機用に準備された時間内に完全なリクエストメッセージを受信しませんでした。
+http.408.reason=リクエストタイムアウト
 http.409.desc=ターゲットリソースの現在の状態との競合のためにリクエストを完了できませんでした。
 http.409.reason=Conflict
 http.410.desc=オリジンサーバーでターゲットリソースへのアクセスが利用できなくなり、この状態が永続的になる可能性があります。
@@ -64,12 +71,19 @@ http.411.desc=サーバーは、定義�
 http.411.reason=Length Required
 http.412.reason=前提条件失敗
 http.413.desc=リクエストペイロードがサーバーが処理できる、または処理できるよりも大きいため、サーバーはリクエストの処理を拒否しています。
+http.413.reason=\ Payload Too Large
 http.414.desc=リクエストの対象がサーバーが解釈しようとするよりも長いため、サーバーはリクエストのサービスを拒否しています。
+http.414.reason=URI Too Long
+http.415.desc=ペイロードがターゲットリソース上のこのメソッドでサポートされていない形式であるため、オリジンサーバーはリクエストを処理することを拒否しています。
 http.415.reason=未対応のメディアタイプです。
 
http.416.desc=リクエストのRangeヘッダーフィールドの範囲のいずれも、選択されたリソースの現在のエクステントと重複しないか、無効な範囲または小さすぎる範囲または重複する範囲の過剰なリクエストのためにリクエストされた範囲の集合が拒否されました。
+http.416.reason=Range Not Satisfiable
 
http.417.desc=リクエストのExpectヘッダーフィールドで指定された期待値が、少なくとも1つのインバウンドサーバーで満たされていない可能性があります。
+http.417.reason=Expectation Failed
 http.421.desc=リクエストはレスポンスを生成できないサーバーに向けられました。
 http.421.reason=Misdirected Request
+http.422.desc=サーバーはリクエストエンティティのコンテンツタイプを理解しており、リクエストエンティティの構文は正しいものの、含まれている命令を処理できませんでした。
+http.422.reason=Unprocessable Entity
 http.423.desc=メソッド呼び出しの依頼元リソース、あるいは依頼先リソースはロックされています。
 http.423.reason=ロックされています
 http.424.desc=要求されたアクションが別のアクションに依存し、そのアクションが失敗したため、このメソッドはリソース上で実行できませんでした。
@@ -88,10 +102,14 @@ http.500.reason=Internal Server Error
 http.501.desc=サーバーは、リクエストを実行するために必要な機能をサポートしていません。
 http.501.reason=Not Implemented
 http.502.desc=ゲートウェイあるいはプロキシサーバーからリクエストを試みた内部サーバーから不正なレスポンスを受信しました。
+http.502.reason=Bad Gateway
+http.503.desc=サーバーは、一時的な過負荷または定期保守のために現在リクエストを処理できません。遅れて緩和される可能性があります。
 http.503.reason=Service Unavailable
 
http.504.desc=ゲートウェイまたはプロキシとして機能しているサーバーは、リクエストを完了するためにアクセスする必要のある上流のサーバーからタイムリーなレスポンスを受信しませんでした。
 http.504.reason=ゲートウェイタイムアウト
+http.505.desc=サーバーは、リクエストメッセージで使用されたメジャーバージョンのHTTPをサポートしていないか、またはサポートを拒否しています。
 http.505.reason=サポートされていないHTTPバージョン
+http.506.desc=サーバーには内部構成エラーがあります。選択された異形のリソースは透過的なコンテンツネゴシエーション自体に関与するように構成されているため、ネゴシエーションプロセスの適切なエンドポイントではありません。
 http.507.desc=サーバーがリクエストを正常に完了するのに必要な表現を保管できないため、このメソッドをリソースに対して実行できませんでした。
 http.507.reason=ストレージに充分な空き容量がありません。
 http.508.desc=サーバーは、 "Depth：infinity"でリクエストを処理している間に無限ループを検出したため、操作を終了しました。
@@ -118,3 +136,4 @@ sslValve.invalidProvider=リクエスト
 stuckThreadDetectionValve.notifyStuckThreadCompleted=スレッド[{0}]（id = 
[{3}]）は以前にスタックされていると報告されましたが完了しました。それはおよそ[{1}]ミリ秒の間アクティブだった。\n\
 \ {2,choice,0#|0< このバルブによって監視されているスレッド [{2}] は残っていますが、スタックされている可能性があります。}
 stuckThreadDetectionValve.notifyStuckThreadDetected=スレッド[{0}]（ID = 
[{6}]）は[{1}]ミリ秒（[{2}以降）から[{4}]に対する同じリクエストを処理するためにアクティブであり、スタックされている可能性があります(このStuckThreadDetectionValveの設定されたしきい値(threshold
 )は[{5}]秒です）。このValveによって監視されているスレッドは合計で[{3}]個あり、スタックされている可能性があります。
+stuckThreadDetectionValve.notifyStuckThreadInterrupted=スレッド [{0}] (id=[{5}]) 
に割り込みが発生しました。[{3}] に対するリクエストの処理時間が [{1}] ミリ秒 ([{2}] から開始) 
を超過したため処理が進まなくなっている可能性があります。StuckThreadDetectionValve

svn commit: r1849232 [1/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:05:29 2018
New Revision: 1849232

URL: http://svn.apache.org/viewvc?rev=1849232&view=rev
Log:
Import updates to Japanese translations

Added:

tomcat/trunk/java/org/apache/tomcat/util/codec/binary/LocalStrings_ja.properties
   (with props)
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties 
  (with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_ja.properties
tomcat/trunk/java/javax/servlet/LocalStrings_ja.properties
tomcat/trunk/java/javax/servlet/http/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/security/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/

svn commit: r1849232 [4/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-18 Thread markt

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ja.properties?rev=1849232&r1=1849231&r2=1849232&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ja.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ja.properties
 Tue Dec 18 21:05:29 2018
@@ -15,7 +15,7 @@
 
 filterDef.invalidFilterName=ãã£ã«ã¿ã¼å®ç¾©ã«ç¡å¹ãª 
<ãã£ã«ã¿ã¼å> [{0}] ãããã¾ãã
 
-securityConstraint.uncoveredHttpMethod=ã»ãã¥ãªãã£ã¼ã®ãããURL 
ãã¿ã¼ã³ [{0}] ã«ã¯ HTTP ã¡ã½ãã [{1}] 
ã®ã¿å¯¾å¿ãã¾ããããä»¥å¤ã® HTTP 
ã¡ã½ããã«ã¯å¯¾å¿ãã¾ããã
+securityConstraint.uncoveredHttpMethod=URLãã¿ã¼ã³[{0}]ã®ã»ãã¥ãªãã£å¶ç´ã®å
 ´åãHTTPã¡ã½ãã[{1}]ã®ã¿ãå¯¾è±¡ã¨ãªãã¾ãã 
ãã®ä»ã®æ¹æ³ã¯ãã¹ã¦å¯¾è±¡å¤ã§ãã
 
securityConstraint.uncoveredHttpMethodFix=æ¬¡ã®[{1}]ã§ã¯ãªãç¹å®ã®HTTPã¡ã½ããã®ã¢ã¯ã»ã¹ãæå¦ããURLãã¿ã¼ã³[{0}]ãæã¤ã»ãã¥ãªãã£å¶ç´ãè¿½å
 ãã¾ãã
 
securityConstraint.uncoveredHttpOmittedMethod=URLãã¿ã¼ã³[{0}]ãæã¤ã»ãã¥ãªãã£å¶ç´ã®å
 ´åãHTTPã¡ã½ãã[{1}]ã¯æ¤åºããã¾ããã
 
securityConstraint.uncoveredHttpOmittedMethodFix=ä¿è·ããã¦ããªãHTTPã¡ã½ãã[{1}]ã§ã®ã¢ã¯ã»ã¹ãæå¦ããURLãã¿ã¼ã³[{0}]ã®ã»ãã¥ãªãã£å¶ç´ãè¿½å
 
@@ -25,29 +25,39 @@ servletDef.invalidServletName=ãµã
 webRuleSet.absoluteOrdering=è¦ç´ 
ã¯web-fragment.xmlã§ç¡å¹ã§ããç¡è¦ããã¾ãã
 webRuleSet.absoluteOrderingCount=è¦ç´ 
ã¯1åã®çºçã«å¶éããã¾ãã
 webRuleSet.postconstruct.duplicate=ã¯ã©ã¹ 
[{0}]ã«PostConstructã¡ã½ããå®ç¾©ãéè¤ãã¦ãã¾ã
+webRuleSet.predestroy.duplicate=ã¯ã©ã¹[{0}]ã®éè¤ãã@PreDestroyã¡ã½ããå®ç¾©
 webRuleSet.relativeOrdering=è¦ç´ 
ã¯web.xmlã§ç¡å¹ã§ããç¡è¦ããã¾ãã
 webRuleSet.relativeOrderingCount=è¦ç´ 
ã¯1åã®åºç¾ã«å¶éããã¾ãã
 
 webXml.duplicateEnvEntry=éè¤ããenvã¨ã³ããªå[{0}]
 webXml.duplicateFilter=åãååã®ãã¡ã¤ã« [{0}] ãåå¨ãã¾ãã
+webXml.duplicateFragment=ååã®ãã©ã°ã¡ã³ã [{0}] 
ãè¤æ°è¦ã¤ããã¾ãããç¸å¯¾çãªé 
åºä»ãã¯æ£å¼ãªæ©è½ã§ã¯ããã¾ãããè©³ç´°ã¯ Servlet 
Speification ã® 8.2.2 ç¯ 2c é ãåç§ãã¦ãã ãããçµ¶å¯¾çãªé 
åºä»ãã®å©ç¨ãæ¤è¨ãã¦ãã ããã
 webXml.duplicateMessageDestination=éè¤ããmessage-destination-name[{0}]
+webXml.duplicateMessageDestinationRef=éè¤ããmessage-destination-ref å 
[{0}]
 webXml.duplicateResourceEnvRef=éè¤ãã resource-env-ref  [{0}]
 webXml.duplicateResourceRef=éè¤ããresource-ref  [{0}]
 webXml.duplicateServletMapping=ãµã¼ãã¬ãã [{0}] ã¨ [{1}] ãåã 
url-pattern [{2}] ã«ãããã³ã°ãããã¨ã¯ã§ãã¾ããã
 webXml.duplicateTaglibUri=URI [{0}] 
ã®ã¿ã°ã©ã¤ãã©ãªã¯éè¤ãã¦ãã¾ãã
+webXml.mergeConflictDisplayName=[{1}] ã«éç½®ããããã©ã°ã¡ã³ã 
[{0}] ã®è¡¨ç¤ºåã¯ãä»ã®ãã©ã°ã¡ã³ãã¨ç°ãªãã¾ãã
 webXml.mergeConflictFilter=[{2}]ã«é
ç½®ãããåå[{1}]ãæã¤ãã©ã°ã¡ã³ããå«ãè¤æ°ã®ãã©ã°ã¡ã³ãã§ãã£ã«ã¿[{0}]ãä¸è²«ãã¦å®ç¾©ããã¦ãã¾ãã
+webXml.mergeConflictLoginConfig=[{1}] ã«éç½®ããããã©ã°ã¡ã³ã 
[{0}] ã® LoginConfig ã¯ãä»ã®ãã©ã°ã¡ã³ãã¨ç°ãªãã¾ãã
 webXml.mergeConflictOrder=ãã©ã°ã¡ã³ãã®ç¸å¯¾é åºã«ã¯å¾ªç°åç
§ãå«ã¾ãã¾ãã ããã¯ãweb.xmlã§çµ¶å¯¾é 
åºãä½¿ç¨ãããã¨ã§è§£æ±ºã§ãã¾ãã
 
webXml.mergeConflictResource=[{2}]ã«ããåå[{1}]ã®ãã©ã°ã¡ã³ããå«ããè¤æ°ã®ãã©ã°ã¡ã³ãã§ãªã½ã¼ã¹[{0}]ãä¸è²«ãã¦å®ç¾©ããã¦ãã¾ããã
 webXml.mergeConflictServlet=Servlet 
[{0}]ã¯ã[{2}]ã«ããåå[{1}]ã®ãã©ã°ã¡ã³ããå«ãè¤æ°ã®ãã©ã°ã¡ã³ãã§ä¸è²«ãã¦å®ç¾©ããã¦ãã¾ãã
 
webXml.mergeConflictSessionCookieComment=ã»ãã·ã§ã³Cookieã®ã³ã¡ã³ãã¯ã[{1}]ã«ããåå[{0}]ã®ãã©ã°ã¡ã³ããå«ãç°ãªãå¤ãæã¤è¤æ°ã®ãã©ã°ã¡ã³ãã§ä¸è²«ãã¦å®ç¾©ããã¦ãã¾ããã
 
webXml.mergeConflictSessionCookieDomain=ã»ãã·ã§ã³Cookieãã¡ã¤ã³ã¯ã[{1}]ã«ããåå[{0}]ã®ãã©ã°ã¡ã³ããå«ããç°ãªãå¤ãæã¤è¤æ°ã®ãã©ã°ã¡ã³ãã§ä¸è²«ãã¦å®ç¾©ããã¦ãã¾ããã
 webXml.mergeConflictSessionCookieHttpOnly=[{1}] ã«é
ç½®ããããã©ã°ã¡ã³ã [{0}] ã®ã»ãã·ã§ã³ã¯ããã¼ http-only 
ãã©ã°ã®å¤ã¯ãä»ã®ãã©ã°ã¡ã³ãã¨ç°ãªãã¾ãã
+webXml.mergeConflictSessionCookieMaxAge=[{1}] ã«é
ç½®ãããã

svn commit: r1849232 [2/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-12-18 Thread markt

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties?rev=1849232&r1=1849231&r2=1849232&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties 
[UTF-8] Tue Dec 18 21:05:29 2018
@@ -25,9 +25,12 @@ htmlManagerServlet.appsTasks=コマン�
 htmlManagerServlet.appsTitle=アプリケーション
 htmlManagerServlet.appsUndeploy=配備解除
 htmlManagerServlet.appsVersion=バージョン
+htmlManagerServlet.configReloadButton=再読み込み
 htmlManagerServlet.configSslHostName=TLSホスト名（オプション）
 htmlManagerServlet.configSslReloadTitle=TLS構成ファイルを再読み込みします。
+htmlManagerServlet.configTitle=構成ファイル
 htmlManagerServlet.connectorStateAliveSocketCount=キープアライブソケット数：
+htmlManagerServlet.connectorStateBytesRecieved=受信バイト数：
 htmlManagerServlet.connectorStateBytesSent=送信バイト：
 htmlManagerServlet.connectorStateErrorCount=エラー数：
 htmlManagerServlet.connectorStateHint=P：パースとリクエスト準備  S：サービス  F：終了  R：Ready  
K：キープアライブ
@@ -36,9 +39,15 @@ htmlManagerServlet.connectorStateMaxThre
 htmlManagerServlet.connectorStateProcessingTime=処理時間：
 htmlManagerServlet.connectorStateRequestCount=リクエスト数：
 htmlManagerServlet.connectorStateTableTitleBRecv=B Recv
+htmlManagerServlet.connectorStateTableTitleBSent=送信バイト数
+htmlManagerServlet.connectorStateTableTitleClientAct=Client (Actual)
+htmlManagerServlet.connectorStateTableTitleClientForw=Client (Forwarded)
 htmlManagerServlet.connectorStateTableTitleRequest=リクエスト
+htmlManagerServlet.connectorStateTableTitleStage=ステージ
+htmlManagerServlet.connectorStateTableTitleTime=時間
 htmlManagerServlet.connectorStateTableTitleVHost=仮想ホスト
 htmlManagerServlet.connectorStateThreadBusy=現在のBusyスレッド：
+htmlManagerServlet.connectorStateThreadCount=現在のスレッド数：
 htmlManagerServlet.deployButton=配備
 htmlManagerServlet.deployConfig=XML設定ファイルのURL:
 htmlManagerServlet.deployPath=コンテキストパス (省略可):
@@ -54,20 +63,25 @@ htmlManagerServlet.deployUploadWarExists
 htmlManagerServlet.deployVersion=バージョン（パラレルデプロイメント用）：
 htmlManagerServlet.deployWar=WARファイル又はディレクトリのURL:
 htmlManagerServlet.diagnosticsLeak=Web 
アプリケーションの停止や再読み込み、配置解除でメモリーリークが発生しているか確認してください。
+htmlManagerServlet.diagnosticsLeakButton=メモリリーク発見
 htmlManagerServlet.diagnosticsLeakWarning=この診断チェックにより、Fill GCがトリガーされます。 
プロダクションシステムには非常に注意して使用してください。
 htmlManagerServlet.diagnosticsSsl=TLSコネクタ構成の診断
 htmlManagerServlet.diagnosticsSslConnectorCertsButton=証明書
 
htmlManagerServlet.diagnosticsSslConnectorCertsText=設定済みのTLS仮想ホストとそれぞれの証明書チェーンを一覧表示します。
 htmlManagerServlet.diagnosticsSslConnectorCipherButton=暗号
+htmlManagerServlet.diagnosticsSslConnectorCipherText=設定済みのTLS仮想ホストとそれぞれの暗号を一覧表示します。
 htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=信頼できる証明書
+htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=設定済みのTLS仮想ホストとそれぞれの信頼できる証明書を一覧表示します。
 htmlManagerServlet.diagnosticsTitle=診断
 htmlManagerServlet.error.idleParam=整数アイドルパラメータ[{0}]を解析できませんでした
 htmlManagerServlet.error.sessions=コンテキスト[{0}]のセッション処理エラーが発生しました
 htmlManagerServlet.error.sortOrder=不明なソート順[{0}]
 htmlManagerServlet.expire.explain=非アクティブ　≥
+htmlManagerServlet.expire.unit=分
 htmlManagerServlet.findleaksList=次のWebアプリケーションは停止しました（再ロード、アンデプロイ）。\n\
 以前の起動からのクラスはまだメモリにロードされているため、メモリ\n\
 リークを引き起こします。（確認のためにプロファイラを使用して下さい）：
+htmlManagerServlet.findleaksNone=停止、再読み込み読み込み、配置解除によりメモリーリークの発生した Web 
アプリケーションはありません。
 htmlManagerServlet.helpHtmlManager=HTMLマネージャヘルプ
 htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
 htmlManagerServlet.helpManager=マネージャヘルプ
@@ -80,16 +94,20 @@ htmlManagerServlet.jvmTableTitleMemoryPo
 htmlManagerServlet.jvmTableTitleTotal=合計
 htmlManagerServlet.jvmTableTitleType=Type
 htmlManagerServlet.jvmTableTitleUsed=使用中
+htmlManagerServlet.jvmTotalMemory=合計メモリ：
 htmlManagerServlet.list=アプリケーションの一覧
 htmlManagerServlet.manager=マネージャ
 htmlManagerServlet.messageLabel=メッセージ
 htmlManagerServlet.noManager=-
+htmlManagerServlet.noVersion=指定なし
 htmlManagerServlet.osAvailableMemory=利用可能なメモリ
 htmlManagerServlet.osFreePageFile=フリーページファイル：
+htmlManagerServlet.osKernelTime=プロセスのカーネル時間：
 htmlManagerServlet.osMemoryLoad=メモリロード：
 htmlManagerServlet.osPhysicalMemory=物理メモリ：
 htmlManagerServlet.osTotalPageFile=合計ページファイル：
 htmlManagerServlet.osUserTime=プロセスユーザ名：
+htmlManagerServlet.serverHostname=ホスト名
 htmlManagerServlet.serverIPAddress=IP アドレス
 htmlManagerServlet.serverJVMVendor=JVMベンダ
 htmlManagerServlet.serverJVMVersion=JVMバージョン
@@ -104,6 +122,7 @@ managerServlet.alreadyContext=FAIL - ア
 managerServlet.certsNotAvailable=実行時にこのコネクタから証明書情報を取得できません。
 managerServlet.copyError=パス [{0}] から設定ファイルをコピーできません
 managerServlet.deleteFail=FAIL  -  [{0}]を削除できません。 
このファイルが継続して存在すると、問題が発生する可能性があります。
+managerServlet.deployFailed=FAIL - コンテキストパス [{0}] にアプリケーションを配備できません。
 managerServlet.deployed=OK - コンテキストパス [{0}] でアプリケーションを配備しました
 managerS

svn commit: r1849233 - in /tomcat/trunk/java/org/apache: catalina/filters/ catalina/ha/deploy/ catalina/ha/tcp/ catalina/servlets/ catalina/session/ catalina/startup/ catalina/tribes/group/interceptor

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:06:25 2018
New Revision: 1849233

URL: http://svn.apache.org/viewvc?rev=1849233&view=rev
Log:
Import updates to Spanish translations

Modified:
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties?rev=1849233&r1=1849232&r2=1849233&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
[UTF-8] Tue Dec 18 21:06:25 2018
@@ -15,6 +15,8 @@
 
 addDefaultCharset.unsupportedCharset=El conjunto especificado de caracteres 
[{0}] no se encuentra soportado
 
+corsFilter.invalidPreflightMaxAge=Incapáz de procesar preflightMaxAge
+
 csrfPrevention.invalidRandomClass=No se puede crear fuente aleatórea usando la 
clase [{0}]
 
 expiresFilter.exceptionProcessingParameter=Excepción al procesar parámetro de 
configuración [{0}]:[{1}]

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties?rev=1849233&r1=1849232&r2=1849233&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties 
Tue Dec 18 21:06:25 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 farmWarDeployer.hostOnly=FarmWarDeployer sÃ³lo puede operar como un 
subelemento de una mÃ¡quina del cluster!
+farmWarDeployer.msgIoe=IncapÃ¡z de leer el archivo de despliegue de la granja
 farmWarDeployer.removeFailRemote=El borrado local de [{0}] fallÃ³, otro 
manager tiene la aplicaciÃ³n en servicio!
 farmWarDeployer.servicingUndeploy=La applicaciÃ³n [{0}] esta en servicion y no 
pude ser removida del nodo de respaldo del cluster
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=1849233&r1=1849232&r2=1849233&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties 
[UTF-8] Tue Dec 18 21:06:25 2018
@@ -20,3 +20,10 @@ ReplicationValve.crossContext.sendDelta=
 ReplicationValve.filter.failure=No puedo compilar filtror=[{0}]
 ReplicationValve.filter.loading=Cargando filtros de requerimiento=[{0}]
 ReplicationValve.invoke.uri=Invocando requerimiento de réplica en [{0}]
+ReplicationValve.nocluster=No cluster configured for this request.
+ReplicationValve.resetDeltaRequest=Cluster is standalone: reset Session 
Request Delta at context [{0}]
+ReplicationValve.send.failure=Unable to perform replication request.
+ReplicationValve.send.invalid.failure=Unable to send session [id={0}] invalid 
message over cluster.
+ReplicationValve.session.found=Context [{0}]: Found session [{1}] but it 
isn''t a ClusterSession.
+ReplicationValve.session.invalid=Context [{0}]: Requested session [{1}] is 
invalid, removed or not replicated at this node.
+ReplicationValve.stats=Average request time= [{0}] ms for Cluster overhead 
time=[{1}] ms for [{2}] requests [{3}] filter requests [{4}] send requests 
[{5}] cross context requests (Request=[{6}] ms Cluster=[{7}] ms).

Modified: 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
URL: 
http://svn.apache.o

svn commit: r1849235 - in /tomcat/trunk/java: javax/el/ javax/servlet/ org/apache/catalina/filters/ org/apache/catalina/ha/backend/ org/apache/catalina/ha/deploy/ org/apache/catalina/ha/session/ org/a

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:08:06 2018
New Revision: 1849235

URL: http://svn.apache.org/viewvc?rev=1849235&view=rev
Log:
Import updates to German translations

Added:
tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_de.properties 
  (with props)
tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings_de.properties   
(with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_de.properties
tomcat/trunk/java/javax/servlet/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_de.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_de.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_de.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_de.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_de.properties?rev=1849235&r1=1849234&r2=1849235&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_de.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_de.properties Tue Dec 18 21:08:06 
2018
@@ -16,4 +16,6 @@
 elProcessor.defineFunctionInvalidClass=Die Klasse [{0}] ist nicht Ã¶ffentlich
 elProcessor.defineFunctionInvalidMethod=Die Methode [{0}] der Klasse [{1}] ist 
nicht public static
 
+expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ ''[{0}]'' 
nicht finden
+
 importHandler.invalidClassNameForStatic=UngÃ¼ltige Klasse [{0}] fÃ¼r 
angegebenen static import [{1}]

Modified: tomcat/trunk/java/javax/servlet/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_de.properties?rev=1849235&r1=1849234&r2=1849235&view=diff
==
--- tomcat/trunk/java/javax/servlet/LocalStrings_de.properties (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_de.properties Tue Dec 18 
21:08:06 2018
@@ -18,3 +18,5 @@ err.not_iso8859_1=Kein ISO 8859-1 Zeiche
 httpMethodConstraintElement.invalidMethod=UngÃ¼ltige HTTP-Methode
 
 value.true=wahr
+
+wrapper.nullResponse=Der Response darf nicht 'null' sein

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties?rev=1849235&r1=1849234&r2=1849235&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties 
Tue Dec 18 21:08:06 2018
@@ -17,6 +17,7 @@ corsFilter.invalidPreflightMaxAge=prefli
 
 csrfPrevention.invalidRandomClass=Kann keine Zufallsquelle mithilfe der Klasse 
[{0}] generieren
 
+expiresFilter.numberError=Ausnahme beim Parsen einer Zahl an Position [{0}] 
(mit Null beginnend) in Komma-separierter Liste [{1}]
 expiresFilter.unsupportedStartingPoint=Nicht unterstÃ¼tzter Startpunkt [{0}]
 
 http.403=Zugriff auf die angeforderte Resource [{0}] wurde verboten.

Added: 
tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_de.properties?rev=1849235&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_de.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/LocalStrings_de.properties 
Tue Dec 18 21:08:06 2018
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expr

svn commit: r1849236 - in /tomcat/trunk/java/org/apache: catalina/manager/ catalina/realm/ catalina/servlets/ catalina/session/ catalina/storeconfig/ catalina/valves/ catalina/webresources/ tomcat/uti

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:10:21 2018
New Revision: 1849236

URL: http://svn.apache.org/viewvc?rev=1849236&view=rev
Log:
Import updates to Portuguese (BR) translations

Added:

tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_pt_BR.properties 
  (with props)

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_pt_BR.properties
   (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_pt_BR.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_pt_BR.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_pt_BR.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties?rev=1849236&r1=1849235&r2=1849236&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties 
Tue Dec 18 21:10:21 2018
@@ -17,4 +17,5 @@ htmlManagerServlet.appsAvailable=Executa
 htmlManagerServlet.appsSessions=SessÃµes
 htmlManagerServlet.serverIPAddress=EndereÃ§o IP
 
+managerServlet.copyError=NÃ£o foi possÃvel copiar o arquivo de configuraÃ§Ã£o 
do caminho [{0}]
 managerServlet.deployed=OK - Instalada aplicaÃ§Ã£o no path de contexto [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties?rev=1849236&r1=1849235&r2=1849236&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties 
Tue Dec 18 21:10:21 2018
@@ -15,6 +15,8 @@
 
 dataSourceRealm.getRoles.exception=ExceÃ§Ã£o ao receber papÃ©is para [{0}]
 
+jaasMemoryLoginModule.unknownAuthenticationMethod=MÃ©todo de autenticaÃ§Ã£o 
desconhecido
+
 lockOutRealm.authLockedUser=Foi feita uma tentativa de autenticaÃ§Ã£o do 
usuÃ¡rio jÃ¡ bloqueado [{0}]
 
 realmBase.authenticateFailure=UsuÃ¡rio [{0}] NÃO autenticado

Modified: 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_pt_BR.properties?rev=1849236&r1=1849235&r2=1849236&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_pt_BR.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_pt_BR.properties 
Tue Dec 18 21:10:21 2018
@@ -15,3 +15,5 @@
 
 cgiServlet.expandFail=Falha ao expandir script no path [{0}] para [{1}]
 cgiServlet.runHeaderReaderFail=Problemas de E/S ao fechar cabeÃ§alho
+
+defaultServlet.xslError=Erro ao transformar o XSL

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_pt_BR.properties?rev=1849236&r1=1849235&r2=1849236&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_pt_BR.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_pt_BR.properties 
Tue Dec 18 21:10:21 2018
@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+persistentManager.isLoadedError=Erro ao checar ser a sessÃ£o [{0}] foi 
carregada na memÃ³ria
+persistentManager.removeError=Erro ao remover a sessÃ£o [{0}] do armazenamento
 persistentManager.storeSizeException=ImpossÃvel determinar o nÃºmero de 
sessÃµes no cache de sessÃ£o, assumindo que o cache estÃ¡ vazio

Added: 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_pt_BR.properties?rev=1849236&view=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_pt_BR.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_pt_BR.properties 
Tue Dec 18 21:10:21 2018
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agree

svn commit: r1849240 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: LocalStrings.properties LocalStrings_fr.properties LocalStrings_ko.properties LocalStrings_zh_CN.properties modules/MbeansD

2018-12-18 Thread markt

Author: markt
Date: Tue Dec 18 21:29:16 2018
New Revision: 1849240

URL: http://svn.apache.org/viewvc?rev=1849240&view=rev
Log:
Remove some unreachable code.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties

tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties 
Tue Dec 18 21:29:16 2018
@@ -35,7 +35,6 @@ managedMBean.noOperation=Cannot find ope
 managedMBean.noSet=Cannot find setter method [{0}] on resource [{1}]
 
 modules.digesterParseError=Error parsing registry data
-modules.nullMethod=No method argument for [{0}]
 modules.readDescriptorsError=Error reading descriptors
 
 registry.initError=Error initializing [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties 
Tue Dec 18 21:29:16 2018
@@ -35,7 +35,6 @@ managedMBean.noOperation=Impossible de t
 managedMBean.noSet=Impossible de trouver la mÃ©thode de modification [{0}] sur 
la ressource [{1}]
 
 modules.digesterParseError=Erreur lors de l'analyse des donnÃ©es du registre
-modules.nullMethod=Pas d''argument mÃ©thode pour [{0}]
 modules.readDescriptorsError=Erreur lors de la lecture des descripteurs
 
 registry.initError=Erreur lors de l''initialisation [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties 
Tue Dec 18 21:29:16 2018
@@ -35,7 +35,6 @@ managedMBean.noOperation=ì¤í¼ë�
 managedMBean.noSet=ë¦¬ìì¤ [{1}]ìì setter ë©ìë [{0}]ì(ë¥¼) ì°¾ì 
ì ììµëë¤.
 
 modules.digesterParseError=ë ì§ì¤í¸ë¦¬ì ë°ì´í°ë¥¼ íì±íë ì¤ 
ì¤ë¥ ë°ì
-modules.nullMethod=[{0}]ì(ë¥¼) ìí ë©ìë ìê·ë¨¼í¸ê° ììµëë¤.
 modules.readDescriptorsError=Descriptorë¤ì ì½ë ì¤ ì¤ë¥ ë°ì
 
 registry.initError=[{0}]ì(ë¥¼) ì´ê¸°ííë ì¤ ì¤ë¥ ë°ì

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties?rev=1849240&r1=1849239&r2=1849240&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties 
Tue Dec 18 21:29:16 2018
@@ -15,7 +15,6 @@
 
 baseModelMBean.nullListener=çå¬å¨ä¸ºç©º
 
-modules.nullMethod=[{0}] æ²¡ææ¹æ³åæ°
 modules.readDescriptorsError=è¯»åæè¿°æä»¶åºé
 
 registry.registerError=æ³¨å MBean åºé

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java?rev=1849240&r1=1849239&r2=1849240&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
 Tue Dec 18 21:29:16 2018
@@ -333,26 +333,26 @@ public class MbeansDescriptorsIntrospect
 mbean.addAttribute(ai);
 }
 
+// This map is populated by iterating the methods (which end up as
+// values in the Map) and obtaining the ke

[Bug 63014] New: Tomcat 9 throws exception when sending unencoded charecters in QueryString

[Bug 63014] Tomcat 9 throws exception when sending unencoded charecters in QueryString

Re: Why tomcat not prevent concurrent requests from same session

Re: [VOTE] Release Apache Tomcat 8.5.37

svn commit: r1849161 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

svn commit: r1849168 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/

buildbot failure in on tomcat-85-trunk

svn commit: r1849169 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/ca.jks

Re: [VOTE] Release Apache Tomcat 8.5.37

[VOTE][RESULT] Release Apache Tomcat 8.5.37

svn commit: r31590 - /dev/tomcat/tomcat-8/v8.5.37/ /release/tomcat/tomcat-8/v8.5.37/

svn commit: r1849171 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

[Bug 63003] Tomcat is closing async connection prematurely when shutdown is initiated.

svn commit: r1849222 - in /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net: TesterSupport.java jsse/TesterBug50640SslImpl.java

buildbot success in on tomcat-85-trunk

svn commit: r1849230 - in /tomcat/trunk/java/org/apache/catalina: core/LocalStrings_fr.properties ha/session/LocalStrings_fr.properties startup/LocalStrings_fr.properties tribes/membership/cloud/Local

svn commit: r1849231 - in /tomcat/trunk/java/org/apache: catalina/deploy/ catalina/ha/deploy/ catalina/ha/session/ catalina/tribes/membership/cloud/ tomcat/util/json/

svn commit: r1849232 [3/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

svn commit: r1849232 [1/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

svn commit: r1849232 [4/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

svn commit: r1849232 [2/4] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

svn commit: r1849233 - in /tomcat/trunk/java/org/apache: catalina/filters/ catalina/ha/deploy/ catalina/ha/tcp/ catalina/servlets/ catalina/session/ catalina/startup/ catalina/tribes/group/interceptor

svn commit: r1849235 - in /tomcat/trunk/java: javax/el/ javax/servlet/ org/apache/catalina/filters/ org/apache/catalina/ha/backend/ org/apache/catalina/ha/deploy/ org/apache/catalina/ha/session/ org/a

svn commit: r1849236 - in /tomcat/trunk/java/org/apache: catalina/manager/ catalina/realm/ catalina/servlets/ catalina/session/ catalina/storeconfig/ catalina/valves/ catalina/webresources/ tomcat/uti

svn commit: r1849240 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler: LocalStrings.properties LocalStrings_fr.properties LocalStrings_ko.properties LocalStrings_zh_CN.properties modules/MbeansD

25 matches

Site Navigation

Mail list logo

Footer information