svn commit: r1792167 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java java/org/apache/catalina/tribes/group/interceptors/MessageDispatchIntercepto
Author: kfujino
Date: Fri Apr 21 06:28:26 2017
New Revision: 1792167
URL: http://svn.apache.org/viewvc?rev=1792167&view=rev
Log:
Add features to get the statistics of the thread pool of the
MessageDispatchInterceptor.
These statistics information can be acquired via JMX.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1792167&r1=1792166&r2=1792167&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Fri Apr 21 06:28:26 2017
@@ -17,6 +17,7 @@
package org.apache.catalina.tribes.group.interceptors;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
@@ -278,4 +279,54 @@ public class MessageDispatchInterceptor
addAndGetCurrentSize(-msg.getMessage().getLength());
}
}
+
+// -- stats of the thread pool
+/**
+ * Return the current number of threads that are managed by the pool.
+ * @return the current number of threads that are managed by the pool
+ */
+public int getPoolSize() {
+if (executor instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) executor).getPoolSize();
+} else {
+return -1;
+}
+}
+
+/**
+ * Return the current number of threads that are in use.
+ * @return the current number of threads that are in use
+ */
+public int getActiveCount() {
+if (executor instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) executor).getActiveCount();
+} else {
+return -1;
+}
+}
+
+/**
+ * Return the total number of tasks that have ever been scheduled for
execution by the pool.
+ * @return the total number of tasks that have ever been scheduled for
execution by the pool
+ */
+public long getTaskCount() {
+if (executor instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) executor).getTaskCount();
+} else {
+return -1;
+}
+}
+
+/**
+ * Return the total number of tasks that have completed execution by the
pool.
+ * @return the total number of tasks that have completed execution by the
pool
+ */
+public long getCompletedTaskCount() {
+if (executor instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) executor).getCompletedTaskCount();
+} else {
+return -1;
+}
+}
+
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java?rev=1792167&r1=1792166&r2=1792167&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
Fri Apr 21 06:28:26 2017
@@ -34,4 +34,13 @@ public interface MessageDispatchIntercep
public int getMaxThreads();
+// pool stats
+public int getPoolSize();
+
+public int getActiveCount();
+
+public long getTaskCount();
+
+public long getCompletedTaskCount();
+
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1792167&r1=1792166&r2=1792167&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 21 06:28:26 2017
@@ -75,8 +75,9 @@
Add features to get the statistics of the thread pool of the
-Receiver component. These statistics information can be
-acquired via JMX. (kfujino)
+Receiver component and
+MessageDispatchInterceptor. These statistics information
+can be acquired via JMX. (kfujino)
Add maxIdleTime attribute to NioReceiverMBean
-
To unsubscr
svn commit: r1792164 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java java/org/apache/catalina/tribes/group/interceptors/MessageDispatchIntercepto
Author: kfujino
Date: Fri Apr 21 06:03:32 2017
New Revision: 1792164
URL: http://svn.apache.org/viewvc?rev=1792164&view=rev
Log:
Add MBean for MessageDispatchInterceptor.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1792164&r1=1792163&r2=1792164&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Fri Apr 21 06:03:32 2017
@@ -40,7 +40,8 @@ import org.apache.juli.logging.LogFactor
* Channel.SEND_OPTIONS_ASYNCHRONOUS flag to be set, if it is, it
* will queue the message for delivery and immediately return to the sender.
*/
-public class MessageDispatchInterceptor extends ChannelInterceptorBase {
+public class MessageDispatchInterceptor extends ChannelInterceptorBase
+implements MessageDispatchInterceptorMBean {
private static final Log log =
LogFactory.getLog(MessageDispatchInterceptor.class);
protected static final StringManager sm =
@@ -144,7 +145,7 @@ public class MessageDispatchInterceptor
this.useDeepClone = useDeepClone;
}
-
+@Override
public long getMaxQueueSize() {
return maxQueueSize;
}
@@ -154,7 +155,7 @@ public class MessageDispatchInterceptor
return useDeepClone;
}
-
+@Override
public long getCurrentSize() {
return currentSize.get();
}
@@ -170,16 +171,17 @@ public class MessageDispatchInterceptor
return value;
}
-
+@Override
public long getKeepAliveTime() {
return keepAliveTime;
}
-
+@Override
public int getMaxSpareThreads() {
return maxSpareThreads;
}
+@Override
public int getMaxThreads() {
return maxThreads;
}
@@ -199,7 +201,7 @@ public class MessageDispatchInterceptor
this.maxThreads = maxThreads;
}
-
+@Override
public boolean isAlwaysSend() {
return alwaysSend;
}
Added:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java?rev=1792164&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
Fri Apr 21 06:03:32 2017
@@ -0,0 +1,37 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.tribes.group.interceptors;
+
+public interface MessageDispatchInterceptorMBean {
+
+public int getOptionFlag();
+
+public boolean isAlwaysSend();
+
+public void setAlwaysSend(boolean alwaysSend);
+
+public long getMaxQueueSize();
+
+public long getCurrentSize();
+
+public long getKeepAliveTime();
+
+public int getMaxSpareThreads();
+
+public int getMaxThreads();
+
+}
Propchange:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.java
--
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1792164&r1=1792163&r2=1792164&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.x
[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 matt...@cacorp.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #13 from matt...@cacorp.com --- Well it was going well for a while, then it crashed again last night. I'm at a loss here, what can I do to help figure this out? -- 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 46121] "resources" ant task clashes with ant 1.7 "resources" element
https://bz.apache.org/bugzilla/show_bug.cgi?id=46121 --- Comment #5 from Mark Thomas --- Ignore the 1.9.5 comment but the INVALID aspect stands. The need to use a namespace is documented in the Manager HowTo. -- 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 46121] "resources" ant task clashes with ant 1.7 "resources" element
https://bz.apache.org/bugzilla/show_bug.cgi?id=46121 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- The minimum Ant version to build 8.5.x is 1.9.5 as documented in BUILDING.txt in the root of the directory. Comment #3 is therefore INVALID but I am restoring the fix status for this issue. -- 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 46121] "resources" ant task clashes with ant 1.7 "resources" element
https://bz.apache.org/bugzilla/show_bug.cgi?id=46121 Jonathan Horowitz changed: What|Removed |Added CC||jhorow...@aod-tech.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 46121] "resources" ant task clashes with ant 1.7 "resources" element
https://bz.apache.org/bugzilla/show_bug.cgi?id=46121 Jonathan Horowitz changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #3 from Jonathan Horowitz --- This is still happening for me with Ant 1.8 and Tomcat 8.5.11. I went through the ASF SVN revisions around that time, and could not find anything regarding this issue. Perhaps the fix was lost on a local dev machine and never committed? -- 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: r1792141 - in /tomcat/tc8.5.x/trunk: ./ res/maven/mvn.properties.default
Author: markt Date: Thu Apr 20 19:48:02 2017 New Revision: 1792141 URL: http://svn.apache.org/viewvc?rev=1792141&view=rev Log: ws police Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:48:02 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,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-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,176
svn commit: r1792140 - /tomcat/trunk/res/maven/mvn.properties.default
Author: markt Date: Thu Apr 20 19:47:35 2017 New Revision: 1792140 URL: http://svn.apache.org/viewvc?rev=1792140&view=rev Log: ws police Modified: tomcat/trunk/res/maven/mvn.properties.default Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792140&r1=1792139&r2=1792140&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 20 19:47:35 2017 @@ -26,7 +26,7 @@ asf.ldap.username=
svn commit: r1792139 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/ha/context/ java/org/apache/catalina/startup/ java/org/apache/catalina/tribes/transport/bio/
Author: markt Date: Thu Apr 20 19:46:08 2017 New Revision: 1792139 URL: http://svn.apache.org/viewvc?rev=1792139&view=rev Log: Remove unnecessary whitespace Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineConfig.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/util/Logs.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:46:08 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,17623
svn commit: r1792137 - /tomcat/tc8.5.x/trunk/webapps/docs/security-howto.xml
Author: markt Date: Thu Apr 20 19:43:01 2017 New Revision: 1792137 URL: http://svn.apache.org/viewvc?rev=1792137&view=rev Log: Fix typos Modified: tomcat/tc8.5.x/trunk/webapps/docs/security-howto.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/security-howto.xml?rev=1792137&r1=1792136&r2=1792137&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/security-howto.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/security-howto.xml Thu Apr 20 19:43:01 2017 @@ -77,12 +77,12 @@ The security of the JMX connection is dependent on the implementation - provided by the JRE and therefore falls outside the control of Tomact. + provided by the JRE and therefore falls outside the control of Tomcat. Typically, access control is very limited (either read-only to everything or read-write to everything). Tomcat exposes a large amount of internal information and control via JMX to aid debugging, monitoring - and management. Give the limited access control available, JMX access + and management. Given the limited access control available, JMX access should be treated as equivalent to local root/admin access and restricted accordingly. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792136 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Author: markt
Date: Thu Apr 20 19:35:05 2017
New Revision: 1792136
URL: http://svn.apache.org/viewvc?rev=1792136&view=rev
Log:
No functional change
Align with 9.0.x
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1792136&r1=1792135&r2=1792136&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Thu Apr 20 19:35:05 2017
@@ -89,7 +89,7 @@ import org.apache.tomcat.util.res.String
* @author Craig R. McClanahan
*/
public abstract class AuthenticatorBase extends ValveBase
-implements Authenticator, RegistrationListener {
+implements Authenticator, RegistrationListener {
private static final Log log = LogFactory.getLog(AuthenticatorBase.class);
@@ -457,7 +457,7 @@ implements Authenticator, RegistrationLi
// The Servlet may specify security constraints through annotations.
// Ensure that they have been processed before constraints are checked
-Wrapper wrapper = request.getMappingData().wrapper;
+Wrapper wrapper = request.getWrapper();
if (wrapper != null) {
wrapper.servletSecurityAnnotationScan();
}
@@ -559,7 +559,7 @@ implements Authenticator, RegistrationLi
if (jaspicProvider == null && !doAuthenticate(request, response) ||
jaspicProvider != null &&
-!authenticateJaspic(request, response, jaspicState,
false)) {
+!authenticateJaspic(request, response,
jaspicState, false)) {
if (log.isDebugEnabled()) {
log.debug(" Failed authenticate() test");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792135 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant: AbstractCatalinaTask.java BaseRedirectorHelperTask.java
Author: markt
Date: Thu Apr 20 19:26:59 2017
New Revision: 1792135
URL: http://svn.apache.org/viewvc?rev=1792135&view=rev
Log:
Align with 9.0.x
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1792135&r1=1792134&r2=1792135&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
Thu Apr 20 19:26:59 2017
@@ -55,13 +55,14 @@ public abstract class AbstractCatalinaTa
protected String charset = "ISO-8859-1";
public String getCharset() {
-return this.charset;
+return charset;
}
public void setCharset(String charset) {
this.charset = charset;
}
+
/**
* The login password for the Manager application.
*/
@@ -75,6 +76,7 @@ public abstract class AbstractCatalinaTa
this.password = password;
}
+
/**
* The URL of the Manager application to be used.
*/
@@ -88,6 +90,7 @@ public abstract class AbstractCatalinaTa
this.url = url;
}
+
/**
* The login username for the Manager application.
*/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1792135&r1=1792134&r2=1792135&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
Thu Apr 20 19:26:59 2017
@@ -29,7 +29,8 @@ import org.apache.tools.ant.types.Redire
/**
* Abstract base class to add output redirection support for Catalina Ant
tasks.
- * These tasks require Ant 1.5 or later.
+ * These tasks require Ant 1.5 or later.
+ *
* WARNING: due to depends chain, Ant could call a Task more
* than once and this can affect the output redirection when configured. If you
* are collecting the output in a property, it will collect the output of only
@@ -73,8 +74,8 @@ public abstract class BaseRedirectorHelp
protected boolean failOnError = true;
/**
- * true true when output redirection is requested for this
task
- * . Default is to log on Ant log.
+ * true true when output redirection is requested for this
task.
+ * Default is to log on Ant log.
*/
protected boolean redirectOutput = false;
@@ -163,7 +164,7 @@ public abstract class BaseRedirectorHelp
/**
- * Property name whose value should be set to the error of the task..
+ * Property name whose value should be set to the error of the task.
*
* @param errorProperty property name
*
@@ -189,7 +190,8 @@ public abstract class BaseRedirectorHelp
/**
* If true, (error and non-error) output will be redirected as specified
* while being sent to Ant's logging mechanism as if no redirection had
- * taken place. Defaults to false.
+ * taken place. Defaults to false.
+ *
* Actually handled internally, with Ant 1.6.3 it will be handled by the
* Redirector itself.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792134 - in /tomcat/trunk/java/org/apache/catalina/ant: AbstractCatalinaCommandTask.java AbstractCatalinaTask.java BaseRedirectorHelperTask.java DeployTask.java FindLeaksTask.java
Author: markt
Date: Thu Apr 20 19:26:44 2017
New Revision: 1792134
URL: http://svn.apache.org/viewvc?rev=1792134&view=rev
Log:
Align with 8.5.x
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java?rev=1792134&r1=1792133&r2=1792134&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
Thu Apr 20 19:26:44 2017
@@ -29,7 +29,7 @@ public abstract class AbstractCatalinaCo
protected String path = null;
public String getPath() {
-return (this.path);
+return this.path;
}
public void setPath(String path) {
@@ -42,13 +42,14 @@ public abstract class AbstractCatalinaCo
protected String version = null;
public String getVersion() {
-return (this.version);
+return this.version;
}
public void setVersion(String version) {
this.version = version;
}
+
// - Public Methods
/**
@@ -76,10 +77,8 @@ public abstract class AbstractCatalinaCo
}
}
} catch (UnsupportedEncodingException e) {
-throw new BuildException
-("Invalid 'charset' attribute: " + getCharset());
+throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
}
return buffer;
}
-
}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1792134&r1=1792133&r2=1792134&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Apr
20 19:26:44 2017
@@ -30,9 +30,9 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.tools.ant.Project;
/**
- * Abstract base class for Ant tasks that interact with the
- * Manager web application for dynamically deploying and
- * undeploying applications. These tasks require Ant 1.4 or later.
+ * Abstract base class for Ant tasks that interact with the Manager
web
+ * application for dynamically deploying and undeploying applications. These
+ * tasks require Ant 1.4 or later.
*
* @author Craig R. McClanahan
* @since 4.1
@@ -69,7 +69,7 @@ public abstract class AbstractCatalinaTa
protected String password = null;
public String getPassword() {
-return (this.password);
+return this.password;
}
public void setPassword(String password) {
@@ -83,7 +83,7 @@ public abstract class AbstractCatalinaTa
protected String url = "http://localhost:8080/manager/text";;
public String getUrl() {
-return (this.url);
+return this.url;
}
public void setUrl(String url) {
@@ -97,7 +97,7 @@ public abstract class AbstractCatalinaTa
protected String username = null;
public String getUsername() {
-return (this.username);
+return this.username;
}
public void setUsername(String username) {
@@ -109,9 +109,9 @@ public abstract class AbstractCatalinaTa
* message that must be "OK -".
*
* When this attribute is set to {@code false} (the default), the first
line
- * of server response is expected to start with "OK -". If it does not
- * then the task is considered as failed and the first line is treated
- * as an error message.
+ * of server response is expected to start with "OK -". If it does not then
+ * the task is considered as failed and the first line is treated as an
+ * error message.
*
* When this attribute is set to {@code true}, the first line of the
* response is treated like any other, regardless of its text.
@@ -129,28 +129,21 @@ public abstract class AbstractCatalinaTa
// - Public Methods
-
/**
- * Execute the specified command. This logic only performs the common
- * attribute validation required by all subclasses; it does not perform
- * any functional logic directly.
+ * Execute the specified command. This logic only performs the common
+ * attribute val
svn commit: r1792133 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Apr 20 19:14:29 2017 New Revision: 1792133 URL: http://svn.apache.org/viewvc?rev=1792133&view=rev Log: Add i18n changes to the log 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=1792133&r1=1792132&r2=1792133&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Apr 20 19:14:29 2017 @@ -79,6 +79,10 @@ possible for the CI system to upload snapshot builds to the ASF Maven repository. (markt) + +Review i18n property files, remove unencessary escaping and consistently +use [...] to delimit inserted values. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792132 [4/5] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/deploy/ java/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties?rev=1792132&r1=1792131&r2=1792132&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
Thu Apr 20 19:13:51 2017
@@ -13,23 +13,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30d5\u30a1\u30a4\u30eb {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059
-fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30d5\u30a1\u30a4\u30eb {1}
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30d5\u30a1\u30a4\u30eb {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a {0}
\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1}
\u306b\u4fdd\u5b58\u3057\u307e\u3059
-JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1}
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 {0}
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1}
\u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc {0}
+fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}]
\u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u306b\u4fdd\u5b58\u3057\u307e\u3059
+fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}]
\u3092\u30d5\u30a1\u30a4\u30eb [{1}]
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
+fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}]
\u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u304b\u3089\u524a\u9664\u3057\u307e\u3059
+JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a [{0}]
\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
+JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}]
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}]
\u306b\u4fdd\u5b58\u3057\u307e\u3059
+JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}]
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}]
\u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
+JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 [{0}]
\u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}]
\u304b\u3089\u524a\u9664\u3057\u307e\u3059
+JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc [{0}]
JDBCStore.checkConnectionDBClosed=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u304cnull\u3067\u3042\u308b\u304b\u3001\u30af\u30ed\u30fc\u30ba\u3055\u308c\u3066\u3044\u308b\u306e\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u518d\u30aa\u30fc\u30d7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
JDBCStore.checkConnectionDBReOpenFail=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u518d\u30aa\u30fc\u30d7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u30c0\u30a6\u30f3\u3057\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
{0}
-JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
{0}
+JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
[{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
[{0}]
managerBase.createSession.ise=createSession:
\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059
-managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059
{0}
-standardManager.loading={0}
\u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
+managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059
[{0}]
+standardManager.loading=[{0}]
\u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
standardManager.loading.exception=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306bException\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092
{0} \u306b\u4fdd\u5b58\u3057\u307e\u3059
+standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30
svn commit: r1792132 [3/5] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/deploy/ java/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=1792132&r1=1792131&r2=1792132&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
Thu Apr 20 19:13:51 2017
@@ -36,7 +36,7 @@ htmlManagerServlet.deployPath=Chemin de
htmlManagerServlet.deployServer=Emplacement du r\u00e9pertoire ou fichier WAR
de d\u00e9ploiement sur le serveur
htmlManagerServlet.deployTitle=Deployer
htmlManagerServlet.deployUpload=Fichier WAR \u00e0 d\u00e9ployer
-htmlManagerServlet.deployUploadFail=ECHEC - T\u00e9l\u00e9versement pour
d\u00e9ploiement a \u00e9chou\u00e9, exception: {0}
+htmlManagerServlet.deployUploadFail=ECHEC - T\u00e9l\u00e9versement pour
d\u00e9ploiement a \u00e9chou\u00e9, exception: [{0}]
htmlManagerServlet.deployUploadFile=Choisir le fichier WAR \u00e0
t\u00e9l\u00e9verser
htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR [{0}] ne peut
\u00eatre t\u00e9l\u00e9vers\u00e9 lorsque le contexte est d\u00e9fini dans
server.xml
htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier \u00e0
t\u00e9l\u00e9verser, [{0}], doit \u00eatre un .war
@@ -55,40 +55,40 @@ htmlManagerServlet.serverOSVersion=Versi
htmlManagerServlet.serverTitle=Serveur
htmlManagerServlet.serverVersion=Version de serveur
htmlManagerServlet.title=Gestionnaire d''applications WEB Tomcat
-managerServlet.alreadyContext=ECHEC - l''application existe d\u00e9j\u00e0
dans le chemin {0}
-managerServlet.deployed=OK - Application d\u00e9ploy\u00e9e pour le chemin de
contexte {0}
-managerServlet.deployFailed=ECHEC - Echec au d\u00e9ploiement de
l''application pour le chemin de contexte {0}
-managerServlet.deployedButNotStarted=ECHEC - Application d\u00e9ploy\u00e9e
pour le chemin de contexte {0} mais le d\u00e9marrage du contexte a
\u00e9chou\u00e9
-managerServlet.exception=ECHEC - L''exception {0} a \u00e9t\u00e9
rencontr\u00e9e
-managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide {0} a
\u00e9t\u00e9 sp\u00e9cifi\u00e9
-managerServlet.listed=OK - Applications list\u00e9es pour l''h\u00f4te virtuel
(virtual host) {0}
+managerServlet.alreadyContext=ECHEC - l''application existe d\u00e9j\u00e0
dans le chemin [{0}]
+managerServlet.deployed=OK - Application d\u00e9ploy\u00e9e pour le chemin de
contexte [{0}]
+managerServlet.deployFailed=ECHEC - Echec au d\u00e9ploiement de
l''application pour le chemin de contexte [{0}]
+managerServlet.deployedButNotStarted=ECHEC - Application d\u00e9ploy\u00e9e
pour le chemin de contexte [{0}] mais le d\u00e9marrage du contexte a
\u00e9chou\u00e9
+managerServlet.exception=ECHEC - L''exception [{0}] a \u00e9t\u00e9
rencontr\u00e9e
+managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a
\u00e9t\u00e9 sp\u00e9cifi\u00e9
+managerServlet.listed=OK - Applications list\u00e9es pour l''h\u00f4te virtuel
(virtual host) [{0}]
managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.noCommand=ECHEC - Aucune commande n''a \u00e9t\u00e9
sp\u00e9cifi\u00e9e
-managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin {0}
+managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin [{0}]
managerServlet.noGlobal=ECHEC - Aucune ressource JNDI globale n''est disponible
-managerServlet.noManager=ECHEC - Aucun gestionnaire n''existe pour le chemin
{0}
+managerServlet.noManager=ECHEC - Aucun gestionnaire n''existe pour le chemin
[{0}]
managerServlet.noSelf=ECHEC - Le gestionnaire ne peut se recharger, se
retirer, s''arr\u00eater, ou se d\u00e9ployer lui-m\u00eame
managerServlet.noWrapper=Le conteneur n''a pas appel\u00e9 "setWrapper()" pour
cette servlet
-managerServlet.notDeployed=ECHEC - Le contexte {0} est d\u00e9fini dans
server.xml et ne peut \u00eatre retir\u00e9
-managerServlet.reloaded=OK - L''application associ\u00e9e au chemin de
contexte {0} a \u00e9t\u00e9 recharg\u00e9e
+managerServlet.notDeployed=ECHEC - Le contexte [{0}] est d\u00e9fini dans
server.xml et ne peut \u00eatre retir\u00e9
+managerServlet.reloaded=OK - L''application associ\u00e9e au chemin de
contexte [{0}] a \u00e9t\u00e9 recharg\u00e9e
managerServlet.resourcesAll=OK - Liste des ressources globales de tout type
-managerServlet.resourcesType=OK - Liste des ressources globales de type {0}
-managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a
\u00e9chou\u00e9: {0}
+managerServlet.resourcesType=OK - Liste des ressources globales de type [{0}]
+managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a
\u00e9chou\u00e9: [{0}]
managerServlet.saved=OK - Configuration serveur sauvegard\u00e9e
-managerServlet.savedContext=OK - Configuration du contexte {0} sauvegard\u00e
svn commit: r1792132 [2/5] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/deploy/ java/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=1792132&r1=1792131&r2=1792132&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
Thu Apr 20 19:13:51 2017
@@ -15,76 +15,76 @@
applicationContext.attributeEvent=\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u306b\u3088\u3063\u3066\u4f8b\u5916\u304c\u6295\u3052\u3089\u308c\u307e\u3057\u305f
applicationContext.mapping.error=\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-applicationContext.requestDispatcher.iae=\u30d1\u30b9 {0}
\u304c"/"\u6587\u5b57\u3067\u59cb\u307e\u308a\u307e\u305b\u3093
+applicationContext.requestDispatcher.iae=\u30d1\u30b9 [{0}]
\u304c"/"\u6587\u5b57\u3067\u59cb\u307e\u308a\u307e\u305b\u3093
applicationContext.setAttribute.namenull=name\u304cnull\u3067\u306f\u3044\u3051\u307e\u305b\u3093
-applicationDispatcher.allocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
{0} \u306b\u4f8b\u5916\u3092\u5272\u308a\u5f53\u3066\u307e\u3059
-applicationDispatcher.deallocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
{0} \u306e\u4f8b\u5916\u3092\u89e3\u9664\u3057\u307e\u3059
+applicationDispatcher.allocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
[{0}] \u306b\u4f8b\u5916\u3092\u5272\u308a\u5f53\u3066\u307e\u3059
+applicationDispatcher.deallocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
[{0}] \u306e\u4f8b\u5916\u3092\u89e3\u9664\u3057\u307e\u3059
applicationDispatcher.forward.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u3092\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5f8c\u3067\u30d5\u30a9\u30ef\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
-applicationDispatcher.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
-applicationDispatcher.serviceException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
{0}
\u306eServlet.service()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
+applicationDispatcher.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 [{0}]
\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
+applicationDispatcher.serviceException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
[{0}]
\u306eServlet.service()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
filterChain.filter=\u30d5\u30a3\u30eb\u30bf\u306e\u5b9f\u884c\u306b\u3088\u308a\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
filterChain.servlet=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u5b9f\u884c\u306b\u3088\u308a\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-naming.bindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
-naming.unbindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30f3\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
-naming.invalidEnvEntryType=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea {0}
\u306f\u7121\u52b9\u306a\u578b\u3092\u6301\u3063\u3066\u3044\u307e\u3059
-naming.invalidEnvEntryValue=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea {0}
\u306f\u7121\u52b9\u306a\u5024\u3092\u6301\u3063\u3066\u3044\u307e\u3059
-naming.namingContextCreationFailed=\u540d\u524d\u4ed8\u304d\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
{0}
-standardContext.applicationListener=\u30af\u30e9\u30b9 {0}
\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+naming.bindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
[{0}]
+naming.unbindFailed=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30f3\u30d0\u30a4\u30f3\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
[{0}]
+naming.invalidEnvEntryType=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea [{0}]
\u306f\u7121\u52b9\u306a\u578b\u3092\u6301\u3063\u3066\u3044\u307e\u3059
+naming.invalidEnvEntryValue=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea [{0}]
\u306f\u7121\u52b9\u306a\u5024\u3092\u6301\u3063\u3066\u3044\u307e\u3059
+naming.namingContextCreationFailed=\u540d\u524d\u4ed8\u304d\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
[{0}]
+standardContext.applicationListener=\u30af\u30e9\u30b9 [{0}]
\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
standardContext.applicationSkipped=\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059
-standardCo
svn commit: r1792132 [1/5] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/deploy/ java/
Author: markt Date: Thu Apr 20 19:13:51 2017 New Revision: 1792132 URL: http://svn.apache.org/viewvc?rev=1792132&view=rev Log: Add [...] delimiters to values in messages that don't currently have them for org.apache.catalina packages Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/LocalStrings
svn commit: r1792132 [5/5] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/deploy/ java/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties?rev=1792132&r1=1792131&r2=1792132&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
Thu Apr 20 19:13:51 2017
@@ -21,6 +21,6 @@ hexUtil.odd=\u5947\u6570\u6841\u306e16\u
extensionValidator.web-application-manifest=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30de\u30cb\u30d5\u30a7\u30b9\u30c8
extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]:
\u5fc5\u8981\u306a\u62e1\u5f35 [{2}]
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
extensionValidator.extension-validation-error=ExtensionValidator[{0}]:
\u5fc5\u8981\u306a\u62e1\u5f35 [{1}]
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
-extensionValidator.failload=\u62e1\u5f35 {0}
\u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+extensionValidator.failload=\u62e1\u5f35 [{0}]
\u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f
SecurityUtil.doAsPrivilege=PrivilegedExceptionAction\u30d6\u30ed\u30c3\u30af\u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-sessionIdGeneratorBase.random=\u30af\u30e9\u30b9 {0}
\u306e\u4e71\u6570\u767a\u751f\u5668\u306e\u521d\u671f\u5316\u306e\u4f8b\u5916\u3067\u3059
+sessionIdGeneratorBase.random=\u30af\u30e9\u30b9 [{0}]
\u306e\u4e71\u6570\u767a\u751f\u5668\u306e\u521d\u671f\u5316\u306e\u4f8b\u5916\u3067\u3059
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1792132&r1=1792131&r2=1792132&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Thu Apr 20 19:13:51 2017
@@ -29,7 +29,7 @@ accessLogValve.invalidPortType=Invalid p
accessLogValve.writeFail=Failed to write log message [{0}]
# Error report valve
-errorReportValve.statusHeader=HTTP Status {0} \u2013 {1}
+errorReportValve.statusHeader=HTTP Status [{0}] \u2013 [{1}]
errorReportValve.type=Type
errorReportValve.exceptionReport=Exception Report
errorReportValve.statusReport=Status Report
@@ -53,9 +53,9 @@ sslValve.certError=Failed to process cer
sslValve.invalidProvider=The SSL provider specified on the connector
associated with this request of [{0}] is invalid. The certificate data could
not be processed.
#Stuck thread detection Valve
-stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id={6}) has
been active for {1} milliseconds (since {2}) to serve the same request for {4}
and may be stuck (configured threshold for this StuckThreadDetectionValve is
{5} seconds). There is/are {3} thread(s) in total that are monitored by this
Valve and may be stuck.
-stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
-stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id={5})
has been interrupted because it was active for {1} milliseconds (since {2}) to
serve the same request for {3} and was probably stuck (configured interruption
threshold for this StuckThreadDetectionValve is {4} seconds).
+stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}])
has been active for [{1}] milliseconds (since [{2}]) to serve the same request
for [{4}] and may be stuck (configured threshold for this
StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in
total that are monitored by this Valve and may be stuck.
+stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}])
was previously reported to be stuck but has completed. It was active for
approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}]
thread(s) that are monitored by this Valve and may be stuck.}
+stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}])
has been interrupted because it was active for [{1}] milliseconds (since [{2}])
to serve the same request for [{3}] and was probably stuck (configured
interruption threshold for this StuckThreadDetectionValve is [{4}] seconds).
# HTTP status reports (error codes only)
# All status codes registered with IANA can be found at
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL:
svn commit: r1792131 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/ajp/LocalStrings.properties java/org/apache/coyote/ajp/LocalStrings_es.properties java/org/apache/coyote/http2/LocalStrings.p
Author: markt Date: Thu Apr 20 19:11:47 2017 New Revision: 1792131 URL: http://svn.apache.org/viewvc?rev=1792131&view=rev Log: Add [...] delimiters to values in messages that don't currently have them for org.apache.coyote packages Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:11:47 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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,1763
svn commit: r1792130 [1/3] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/resources/
Author: markt Date: Thu Apr 20 19:11:23 2017 New Revision: 1792130 URL: http://svn.apache.org/viewvc?rev=1792130&view=rev Log: Add [...] delimiters to values in messages that don't currently have them for org.apache.jasper packages Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:11:23 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,
svn commit: r1792130 [2/3] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/resources/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1792130&r1=1792129&r2=1792130&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Thu Apr 20 19:11:23 2017
@@ -19,64 +19,64 @@ jsp.error.compiler = No hay compilador J
jsp.error.no.scratch.dir = El motor JSP no tiene configurado un directorio de
trabajo.\n\
\ A\u00F1ada "jsp.initparams=scratchdir=" \n\
\ en el fichero servlets.properties para este contexto.
-jsp.error.bad.scratch.dir = El directorio de trabajo especificado: {0} no es
utilizable.
-jsp.message.scratch.dir.is = El directorio de trabajo para el motor JSP es: {0}
-jsp.message.parent_class_loader_is = El cargador de clases es: {0}
+jsp.error.bad.scratch.dir = El directorio de trabajo especificado: [{0}] no es
utilizable.
+jsp.message.scratch.dir.is = El directorio de trabajo para el motor JSP es:
[{0}]
+jsp.message.parent_class_loader_is = El cargador de clases es: [{0}]
jsp.message.dont.modify.servlets = IMPORTANTE: No modifique los servlets
generados
jsp.error.unavailable = JSP ha sido marcado como no disponible
-jsp.error.usebean.duplicate = useBean: Nombre de bean duplicado: {0}
-jsp.error.invalid.scope = Valor ilegal de atributo ''scope'': {0} (debe de ser
uno de "page", "request", "session", o "application")
+jsp.error.usebean.duplicate = useBean: Nombre de bean duplicado: [{0}]
+jsp.error.invalid.scope = Valor ilegal de atributo ''scope'': [{0}] (debe de
ser uno de "page", "request", "session", o "application")
jsp.error.classname = No pude determinar el nombre de clase desde el fichero
.class
jsp.error.outputfolder = no hay carpeta de salida
jsp.error.data.file.write = Error mientras escrib\u00EDa el archivo de datos
-jsp.error.page.conflict.contenttype = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo:
{0}, nuevo: {1})
-jsp.error.page.conflict.session = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''session'' con valores distintos (viejo: {0},
nuevo: {1})
+jsp.error.page.conflict.contenttype = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo:
[{0}], nuevo: [{1}])
+jsp.error.page.conflict.session = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''session'' con valores distintos (viejo: [{0}],
nuevo: [{1}])
jsp.error.page.invalid.session = Directiva Page: valor incorrecto para session
-jsp.error.page.conflict.buffer = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''buffer'' con valores distintos (viejo: {0},
nuevo: {1})
+jsp.error.page.conflict.buffer = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''buffer'' con valores distintos (viejo: [{0}],
nuevo: [{1}])
jsp.error.page.invalid.buffer = Directiva Page: valor incorrecto para
b\u00FAfer
-jsp.error.page.conflict.autoflush = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo: {0},
nuevo: {1})
-jsp.error.page.conflict.isthreadsafe = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''isThreadSafe'' con valores distintos (viejo:
{0}, nuevo: {1})
+jsp.error.page.conflict.autoflush = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo:
[{0}], nuevo: [{1}])
+jsp.error.page.conflict.isthreadsafe = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''isThreadSafe'' con valores distintos (viejo:
[{0}], nuevo: [{1}])
jsp.error.page.invalid.isthreadsafe = =Directiva Page: valor incorrecto para
isThreadSafe
-jsp.error.page.conflict.info = Directiva Page: es ilegal tener m\u00FAltiples
ocurrencias de ''info'' con valores distintos (viejo: {0}, nuevo: {1})
+jsp.error.page.conflict.info = Directiva Page: es ilegal tener m\u00FAltiples
ocurrencias de ''info'' con valores distintos (viejo: [{0}], nuevo: [{1}])
jsp.error.page.invalid.info = =Directiva Page: valor incorrecto para info
-jsp.error.page.conflict.iserrorpage = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''isErrorPage'' con valores distintos (viejo:
{0}, nuevo: {1})
+jsp.error.page.conflict.iserrorpage = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''isErrorPage'' con valores distintos (viejo:
[{0}], nuevo: [{1}])
jsp.error.page.invalid.iserrorpage = =Directiva Page: valor incorrecto para
isErrorPage
-jsp.error.page.conflict.errorpage = Directiva Page: es ilegal tener
m\u00FAltiples ocurrencias de ''errorPage'' con valores distintos (viejo: {0},
nuevo: {1})
-jsp.error.page.conflict.language = Directiva Page: es ilegal te
svn commit: r1792130 [3/3] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/resources/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1792130&r1=1792129&r2=1792130&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Thu Apr 20 19:11:23 2017
@@ -19,58 +19,58 @@
jsp.error.no.scratch.dir=JSP\u30a8\u30f3\u30b8\u30f3\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u306escratchDir\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\
\n
\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306eservlets.properties\u30d5\u30a1\u30a4\u30eb\u306b\u3001\
\n "jsp.initparams=scratchdir="
\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-jsp.error.bad.scratch.dir=\u3042\u306a\u305f\u304c\u6307\u5b9a\u3057\u305fscratchDir:
{0} \u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
-jsp.message.scratch.dir.is=JSP\u30a8\u30f3\u30b8\u30f3\u306eScratchdir: {0}
-jsp.message.parent_class_loader_is=\u89aa\u30af\u30e9\u30b9\u30ed\u30fc\u30c0:
{0}
+jsp.error.bad.scratch.dir=\u3042\u306a\u305f\u304c\u6307\u5b9a\u3057\u305fscratchDir:
[{0}] \u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
+jsp.message.scratch.dir.is=JSP\u30a8\u30f3\u30b8\u30f3\u306eScratchdir: [{0}]
+jsp.message.parent_class_loader_is=\u89aa\u30af\u30e9\u30b9\u30ed\u30fc\u30c0:
[{0}]
jsp.message.dont.modify.servlets=\u91cd\u8981:
\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u5909\u66f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
-jsp.error.usebean.duplicate=useBean:
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
-jsp.error.invalid.scope=''scope''\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
{0}
("page"\u3001"request"\u3001"session"\u53c8\u306f"application"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
+jsp.error.usebean.duplicate=useBean:
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: [{0}]
+jsp.error.invalid.scope=''scope''\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
[{0}]
("page"\u3001"request"\u3001"session"\u53c8\u306f"application"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50:
''contentType''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.session=page\u6307\u793a\u5b50:
''session''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50:
''contentType''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: [{0}], \u65b0: [{1}])
+jsp.error.page.conflict.session=page\u6307\u793a\u5b50:
''session''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: [{0}], \u65b0: [{1}])
jsp.error.page.invalid.session=page\u6307\u793a\u5b50:
session\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50:
''buffer''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50:
''buffer''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: [{0}], \u65b0: [{1}])
jsp.error.page.invalid.buffer=page\u6307\u793a\u5b50:
buffer\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50:
''autoFlush''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.isthreadsafe=page\u6307\u793a\u5b50:
''isThreadSafe''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50:
''autoFlush''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52
svn commit: r1792129 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/el/ java/org/apache/naming/
Author: markt Date: Thu Apr 20 19:10:57 2017 New Revision: 1792129 URL: http://svn.apache.org/viewvc?rev=1792129&view=rev Log: Add [...] delimiters to values in messages that don't currently have them for org.apache.el and org.apache.naming packages Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:10:57 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324
svn commit: r1792128 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ java/org/apache/tomcat/util/net/o
Author: markt Date: Thu Apr 20 19:10:37 2017 New Revision: 1792128 URL: http://svn.apache.org/viewvc?rev=1792128&view=rev Log: Add [...] delimiters to values in messages that don't currently have them for org.apache.tomcat packages Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:10:37 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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,17582
svn commit: r1792127 - in /tomcat/tc8.5.x/trunk: ./ java/javax/el/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/servle
Author: markt Date: Thu Apr 20 19:10:11 2017 New Revision: 1792127 URL: http://svn.apache.org/viewvc?rev=1792127&view=rev Log: Replace the use of (...) to delimit values in messages with [...] because it is more consistent. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:10:11 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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,175
[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 18 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-7.7-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-7.7-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170420.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.6-SNAPSHOT.jar :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20170420.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170420.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-22.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-7.7-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 7.7-SNAPSHOT on 3124 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/res/maven/mvn.properties.default:29: Line matches the illegal pattern '\s+$'. [RegexpSingleline] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:539: Got 1 errors and 0 warnings. Total time: 18 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20170420180006, vmgump-vm3.apache.org:vmgump:20170420180006 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump-vm3] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792126 - in /tomcat/tc8.5.x/trunk: ./ webapps/examples/WEB-INF/classes/LocalStrings_es.properties
Author: markt Date: Thu Apr 20 19:09:33 2017 New Revision: 1792126 URL: http://svn.apache.org/viewvc?rev=1792126&view=rev Log: Remove unnecessary escaping Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:09:33 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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-1763635,1763718,1763786,1763798-1763799,1763810,17638
svn commit: r1792125 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/LocalStrings_es.properties java/org/apache/el/Messages_es.properties java/org/apache/jasper/resources/LocalStrings_e
Author: markt Date: Thu Apr 20 19:08:57 2017 New Revision: 1792125 URL: http://svn.apache.org/viewvc?rev=1792125&view=rev Log: # does not need to be escaped in the value component of a properties file Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:08:57 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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
svn commit: r1792124 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/resources/LocalStrings.properties java/org/apache/jasper/resources/LocalStrings_ja.properties
Author: markt Date: Thu Apr 20 19:08:30 2017 New Revision: 1792124 URL: http://svn.apache.org/viewvc?rev=1792124&view=rev Log: ' does not need to be escaped in the value component of a properties file (assuming the value won't be passed to a MessageFormat instance) Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:08:30 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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,17
svn commit: r1792123 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/jasper/resources/
Author: markt Date: Thu Apr 20 19:08:08 2017 New Revision: 1792123 URL: http://svn.apache.org/viewvc?rev=1792123&view=rev Log: Additional replacement of "..." to delimit values in messages with [...] after removing unnecessary escaping of " Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:08:08 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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,176
svn commit: r1792122 - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/http/ java/org/apache/catalina/manager/ java/org/apache/jasper/resources/
Author: markt Date: Thu Apr 20 19:07:34 2017 New Revision: 1792122 URL: http://svn.apache.org/viewvc?rev=1792122&view=rev Log: " does not need to be escaped in the value component of a properties file Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:07:34 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-
svn commit: r1792121 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/ha/tcp/ java/org/apache/el/ java/org/apache/jasper/resources/
Author: markt Date: Thu Apr 20 19:06:56 2017 New Revision: 1792121 URL: http://svn.apache.org/viewvc?rev=1792121&view=rev Log: = does not need to be escaped in the value component of a properties file Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:06:56 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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,176323
svn commit: r1792120 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/manager/host/ java/org/apache/catalina/tribes/transp
Author: markt Date: Thu Apr 20 19:06:19 2017 New Revision: 1792120 URL: http://svn.apache.org/viewvc?rev=1792120&view=rev Log: ! does not need to be escaped in the value component of a properties file Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:06:19 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,176237
svn commit: r1792119 [2/2] - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1792119&r1=1792118&r2=1792119&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Thu Apr 20 19:05:57 2017
@@ -19,40 +19,40 @@ jsp.error.compiler = No hay compilador J
jsp.error.no.scratch.dir = El motor JSP no tiene configurado un directorio de
trabajo.\n\
\ A\u00F1ada "jsp.initparams\=scratchdir\=" \n\
\ en el fichero servlets.properties para este contexto.
-jsp.error.bad.scratch.dir = El directorio de trabajo especificado\: {0} no es
utilizable.
-jsp.message.scratch.dir.is = El directorio de trabajo para el motor JSP es\:
{0}
-jsp.message.parent_class_loader_is = El cargador de clases es\: {0}
-jsp.message.dont.modify.servlets = IMPORTANTE\: No modifique los servlets
generados
+jsp.error.bad.scratch.dir = El directorio de trabajo especificado: {0} no es
utilizable.
+jsp.message.scratch.dir.is = El directorio de trabajo para el motor JSP es: {0}
+jsp.message.parent_class_loader_is = El cargador de clases es: {0}
+jsp.message.dont.modify.servlets = IMPORTANTE: No modifique los servlets
generados
jsp.error.unavailable = JSP ha sido marcado como no disponible
-jsp.error.usebean.duplicate = useBean\: Nombre de bean duplicado\: {0}
-jsp.error.invalid.scope = Valor ilegal de atributo ''scope''\: {0} (debe de
ser uno de "page", "request", "session", o "application")
+jsp.error.usebean.duplicate = useBean: Nombre de bean duplicado: {0}
+jsp.error.invalid.scope = Valor ilegal de atributo ''scope'': {0} (debe de ser
uno de "page", "request", "session", o "application")
jsp.error.classname = No pude determinar el nombre de clase desde el fichero
.class
jsp.error.outputfolder = no hay carpeta de salida
jsp.error.data.file.write = Error mientras escrib\u00EDa el archivo de datos
-jsp.error.page.conflict.contenttype = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo\:
{0}, nuevo\: {1})
-jsp.error.page.conflict.session = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''session'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.invalid.session = Directiva Page\: valor incorrecto para session
-jsp.error.page.conflict.buffer = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''buffer'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.invalid.buffer = Directiva Page\: valor incorrecto para
b\u00FAfer
-jsp.error.page.conflict.autoflush = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.isthreadsafe = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''isThreadSafe'' con valores distintos (viejo\:
{0}, nuevo\: {1})
-jsp.error.page.invalid.isthreadsafe = \=Directiva Page\: valor incorrecto para
isThreadSafe
-jsp.error.page.conflict.info = Directiva Page\: es ilegal tener m\u00FAltiples
ocurrencias de ''info'' con valores distintos (viejo\: {0}, nuevo\: {1})
-jsp.error.page.invalid.info = \=Directiva Page\: valor incorrecto para info
-jsp.error.page.conflict.iserrorpage = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''isErrorPage'' con valores distintos (viejo\:
{0}, nuevo\: {1})
-jsp.error.page.invalid.iserrorpage = \=Directiva Page\: valor incorrecto para
isErrorPage
-jsp.error.page.conflict.errorpage = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''errorPage'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.language = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.tag.conflict.language = Directiva Tag\: es ilegal tener
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.language.nonjava = Directiva Page\: atributo language incorrecto
-jsp.error.tag.language.nonjava = Directiva Tag\: atributo language incorrecto
-jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''extends'' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\:
{0}, nuevo\: {1})
-jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\:
{0}, nuevo\: {1})
-jsp.error.page.invalid.iselignored = Directiva Page\: valor inv\u00E1lido para
isELIgnored
-jsp.error.tag.invalid.iselig
svn commit: r1792119 [1/2] - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache
Author: markt Date: Thu Apr 20 19:05:57 2017 New Revision: 1792119 URL: http://svn.apache.org/viewvc?rev=1792119&view=rev Log: : does not need to be escaped in the value component of a properties file Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/servlet/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:05:57 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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,17560
svn commit: r1792118 - in /tomcat/tc8.5.x/trunk: ./ java/javax/el/ java/javax/servlet/ java/javax/servlet/http/
Author: markt Date: Thu Apr 20 19:05:27 2017 New Revision: 1792118 URL: http://svn.apache.org/viewvc?rev=1792118&view=rev Log: Add [...] delimiters to values in messages that don't currently have them for javax packages Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/javax/servlet/LocalStrings.properties tomcat/tc8.5.x/trunk/java/javax/servlet/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/javax/servlet/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/javax/servlet/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/javax/servlet/http/LocalStrings.properties tomcat/tc8.5.x/trunk/java/javax/servlet/http/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/javax/servlet/http/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:05:27 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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,17604
svn commit: r1792117 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/manager/ java/org/apac
Author: markt Date: Thu Apr 20 19:05:04 2017 New Revision: 1792117 URL: http://svn.apache.org/viewvc?rev=1792117&view=rev Log: Replace the use of "..." to delimit values in messages with [...] because it is more consistent. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:05:04 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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,1755
svn commit: r1792116 - in /tomcat/tc8.5.x/trunk: ./ java/javax/el/ java/org/apache/el/ java/org/apache/jasper/resources/ java/org/apache/naming/
Author: markt Date: Thu Apr 20 19:04:32 2017 New Revision: 1792116 URL: http://svn.apache.org/viewvc?rev=1792116&view=rev Log: Replace the use of '...' to delimit values in messages with [...] because a) it is more consistent and b) ' needs to be escaped whereas [ and ] do not. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings.properties tomcat/tc8.5.x/trunk/java/javax/el/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages.properties tomcat/tc8.5.x/trunk/java/org/apache/el/Messages_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/naming/LocalStrings_es.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 19:04:32 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-17597
svn commit: r1792112 - in /tomcat/tc8.5.x/trunk: ./ java/javax/el/ java/javax/security/auth/message/config/ java/javax/websocket/ java/javax/websocket/server/ java/org/apache/catalina/authenticator/ja
Author: markt Date: Thu Apr 20 18:56:45 2017 New Revision: 1792112 URL: http://svn.apache.org/viewvc?rev=1792112&view=rev Log: Back-port Java 9 newInstance() changes to reduce the diff between 9.0.x and 8.5.x Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java tomcat/tc8.5.x/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java tomcat/tc8.5.x/trunk/java/javax/websocket/ContainerProvider.java tomcat/tc8.5.x/trunk/java/javax/websocket/server/ServerEndpointConfig.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 18:56:45 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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
Re: svn commit: r1792055 - in /tomcat/trunk/res/maven: README.txt mvn-pub.xml mvn.properties.default
On 20/04/2017 15:11, Violeta Georgieva wrote:
> Here the version is hardcoded
> Instead of
>
> https://archive.apache.org/dist/maven/ant-tasks/2.1.3
>
> it should be
>
> https://archive.apache.org/dist/maven/ant-tasks/${maven-ant-tasks.version}
Thanks. Fixed.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792094 - in /tomcat/tc8.5.x/trunk: ./ res/maven/mvn.properties.default
Author: markt Date: Thu Apr 20 17:15:00 2017 New Revision: 1792094 URL: http://svn.apache.org/viewvc?rev=1792094&view=rev Log: Parameterise version I missed previously. Thanks to violetagg. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 17:15:00 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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-1763635,1763718,1763786,1763798-1763799,176381
svn commit: r1792093 - /tomcat/trunk/res/maven/mvn.properties.default
Author: markt
Date: Thu Apr 20 17:13:49 2017
New Revision: 1792093
URL: http://svn.apache.org/viewvc?rev=1792093&view=rev
Log:
Parameterise version I missed previously. Thanks to violetagg.
Modified:
tomcat/trunk/res/maven/mvn.properties.default
Modified: tomcat/trunk/res/maven/mvn.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792093&r1=1792092&r2=1792093&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 20 17:13:49 2017
@@ -63,5 +63,5 @@ base.path=${user.home}/tomcat-build-libs
# - Maven Ant Tasks -
maven-ant-tasks.version=2.1.3
maven-ant-tasks.home=${base.path}/maven-ant-tasks-${maven-ant-tasks.version}
-maven-ant-tasks.loc=https://archive.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-${maven-ant-tasks.version}.jar
+maven-ant-tasks.loc=https://archive.apache.org/dist/maven/ant-tasks/${maven-ant-tasks.version}/binaries/maven-ant-tasks-${maven-ant-tasks.version}.jar
maven-ant-tasks.jar=${maven-ant-tasks.home}/maven-ant-tasks-${maven-ant-tasks.version}.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] Snapshots now published to Nexus after every CI build for 8.5.x and 9.0.x
2017-04-20 16:20 GMT+02:00 Mark Thomas : > Hi, > > With some help from the infra team, I have just finished configuring the > CI system to publish snapshot builds to Nexus after every CI run for > 9.0.x and 8.5.x. > > The snapshots include: > - all the individual JARs > - all the embedded JARs > - the .tar.gz and .zip distributions > > In other words, we have a resource we can point users that want to test > fixes to where they can grab a build of the latest source without having > to build it themselves (I still think we should encourage them to build > it themselves in the first instance). > > It may turn out that publishing a snapshot after every release causes > some sort of resource issue for infra. If that is the case, we can drop > it down to once a day. > That sounds excellent ! Rémy > > Enjoy! > > Mark > > Join us at TomcatCon in Miami for 3 days of Apache Tomcat content: > https://tomcat.apache.org/conference.html > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[ANN] Snapshots now published to Nexus after every CI build for 8.5.x and 9.0.x
Hi, With some help from the infra team, I have just finished configuring the CI system to publish snapshot builds to Nexus after every CI run for 9.0.x and 8.5.x. The snapshots include: - all the individual JARs - all the embedded JARs - the .tar.gz and .zip distributions In other words, we have a resource we can point users that want to test fixes to where they can grab a build of the latest source without having to build it themselves (I still think we should encourage them to build it themselves in the first instance). It may turn out that publishing a snapshot after every release causes some sort of resource issue for infra. If that is the case, we can drop it down to once a day. Enjoy! Mark Join us at TomcatCon in Miami for 3 days of Apache Tomcat content: https://tomcat.apache.org/conference.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1792055 - in /tomcat/trunk/res/maven: README.txt mvn-pub.xml mvn.properties.default
Hi Mark,
2017-04-20 16:35 GMT+03:00 :
>
> Author: markt
> Date: Thu Apr 20 13:35:16 2017
> New Revision: 1792055
>
> URL: http://svn.apache.org/viewvc?rev=1792055&view=rev
> Log:
> Download the require Maven Ant tasks plugin as part of the build. This
simplifies initial setup for new RMs and the CI system.
>
> Modified:
> tomcat/trunk/res/maven/README.txt
> tomcat/trunk/res/maven/mvn-pub.xml
> tomcat/trunk/res/maven/mvn.properties.default
>
> Modified: tomcat/trunk/res/maven/README.txt
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/README.txt?rev=1792055&r1=1792054&r2=1792055&view=diff
>
==
> --- tomcat/trunk/res/maven/README.txt (original)
> +++ tomcat/trunk/res/maven/README.txt Thu Apr 20 13:35:16 2017
> @@ -16,10 +16,8 @@
>
>
> General preparations before any publishing:
> -1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place
it in
> -this directory
> -2 - Generate a standard Tomcat release (ant release)
> -3 - Copy mvn.properties.default to mvn.properties and adjust it as
necessary.
> +1 - Generate a standard Tomcat release (ant release)
> +2 - Copy mvn.properties.default to mvn.properties and adjust it as
necessary.
> You will need to set asf.ldap.username and you'll probably need to
set
> gpg.exec
> The other properties should be OK. Note: you will be prompted for
your
>
> Modified: tomcat/trunk/res/maven/mvn-pub.xml
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1792055&r1=1792054&r2=1792055&view=diff
>
==
> --- tomcat/trunk/res/maven/mvn-pub.xml (original)
> +++ tomcat/trunk/res/maven/mvn-pub.xml Thu Apr 20 13:35:16 2017
> @@ -28,10 +28,16 @@
>
>
>
> +
> +
> +
> +
> +
> +
> uri="urn:maven-artifact-ant">
>
> -
> +
>
>
>
> @@ -390,4 +396,27 @@
>
>
>
> +
> +
> +
> + + proxyuser="${proxy.user}"
proxypassword="${proxy.password}" />
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
>
>
> Modified: tomcat/trunk/res/maven/mvn.properties.default
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792055&r1=1792054&r2=1792055&view=diff
>
==
> --- tomcat/trunk/res/maven/mvn.properties.default (original)
> +++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 20 13:35:16 2017
> @@ -53,3 +53,15 @@ tomcat.extras.src.path=../../output/extr
>
> #Where do we find the POM files
> tomcat.pom.path=../../res/maven
> +
> +# - Default Base Path for Dependent Packages -
> +# Please note this path must be absolute, not relative,
> +# as it is referenced with different working directory
> +# contexts by the various build scripts.
> +base.path=${user.home}/tomcat-build-libs
> +
> +# - Maven Ant Tasks -
> +maven-ant-tasks.version=2.1.3
>
+maven-ant-tasks.home=${base.path}/maven-ant-tasks-${maven-ant-tasks.version}
> +maven-ant-tasks.loc=
https://archive.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-${maven-ant-tasks.version}.jar
Here the version is hardcoded
Instead of
https://archive.apache.org/dist/maven/ant-tasks/2.1.3
it should be
https://archive.apache.org/dist/maven/ant-tasks/${maven-ant-tasks.version}
Regards,
Violeta
>
+maven-ant-tasks.jar=${maven-ant-tasks.home}/maven-ant-tasks-${maven-ant-tasks.version}.jar
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
svn commit: r1792059 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
Author: markt
Date: Thu Apr 20 13:59:51 2017
New Revision: 1792059
URL: http://svn.apache.org/viewvc?rev=1792059&view=rev
Log:
Trivial clean-up to trigger CI build
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/FindLeaksTask.java?rev=1792059&r1=1792058&r2=1792059&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/FindLeaksTask.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/FindLeaksTask.java Thu
Apr 20 13:59:51 2017
@@ -47,6 +47,7 @@ public class FindLeaksTask extends Abstr
return statusLine;
}
+
/**
* Execute the requested operation.
*
@@ -54,9 +55,7 @@ public class FindLeaksTask extends Abstr
*/
@Override
public void execute() throws BuildException {
-
super.execute();
execute("/findleaks?statusLine=" + Boolean.toString(statusLine));
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2329 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1792055 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: r1792057 - in /tomcat/tc8.5.x/trunk: ./ res/maven/README.txt res/maven/mvn-pub.xml res/maven/mvn.properties.default
Author: markt Date: Thu Apr 20 13:51:24 2017 New Revision: 1792057 URL: http://svn.apache.org/viewvc?rev=1792057&view=rev Log: Additional changes required so the CI system can publish snapshots Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/res/maven/README.txt tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 13:51:24 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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,17635
svn commit: r1792056 - /tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
Author: markt
Date: Thu Apr 20 13:43:52 2017
New Revision: 1792056
URL: http://svn.apache.org/viewvc?rev=1792056&view=rev
Log:
Trivial clean-up to trigger CI build
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1792056&r1=1792055&r2=1792056&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Apr
20 13:43:52 2017
@@ -55,7 +55,7 @@ public abstract class AbstractCatalinaTa
protected String charset = "ISO-8859-1";
public String getCharset() {
-return (this.charset);
+return charset;
}
public void setCharset(String charset) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792055 - in /tomcat/trunk/res/maven: README.txt mvn-pub.xml mvn.properties.default
Author: markt
Date: Thu Apr 20 13:35:16 2017
New Revision: 1792055
URL: http://svn.apache.org/viewvc?rev=1792055&view=rev
Log:
Download the require Maven Ant tasks plugin as part of the build. This
simplifies initial setup for new RMs and the CI system.
Modified:
tomcat/trunk/res/maven/README.txt
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/mvn.properties.default
Modified: tomcat/trunk/res/maven/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/README.txt?rev=1792055&r1=1792054&r2=1792055&view=diff
==
--- tomcat/trunk/res/maven/README.txt (original)
+++ tomcat/trunk/res/maven/README.txt Thu Apr 20 13:35:16 2017
@@ -16,10 +16,8 @@
General preparations before any publishing:
-1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place it in
-this directory
-2 - Generate a standard Tomcat release (ant release)
-3 - Copy mvn.properties.default to mvn.properties and adjust it as necessary.
+1 - Generate a standard Tomcat release (ant release)
+2 - Copy mvn.properties.default to mvn.properties and adjust it as necessary.
You will need to set asf.ldap.username and you'll probably need to set
gpg.exec
The other properties should be OK. Note: you will be prompted for your
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1792055&r1=1792054&r2=1792055&view=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Apr 20 13:35:16 2017
@@ -28,10 +28,16 @@
+
+
+
+
+
+
-
+
@@ -390,4 +396,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: tomcat/trunk/res/maven/mvn.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792055&r1=1792054&r2=1792055&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 20 13:35:16 2017
@@ -53,3 +53,15 @@ tomcat.extras.src.path=../../output/extr
#Where do we find the POM files
tomcat.pom.path=../../res/maven
+
+# - Default Base Path for Dependent Packages -
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=${user.home}/tomcat-build-libs
+
+# - Maven Ant Tasks -
+maven-ant-tasks.version=2.1.3
+maven-ant-tasks.home=${base.path}/maven-ant-tasks-${maven-ant-tasks.version}
+maven-ant-tasks.loc=https://archive.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-${maven-ant-tasks.version}.jar
+maven-ant-tasks.jar=${maven-ant-tasks.home}/maven-ant-tasks-${maven-ant-tasks.version}.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in on tomcat-trunk
On 20/04/17 12:59, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building . Full details are available at: > https://ci.apache.org/builders/tomcat-trunk/builds/2328 > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: silvanus_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' > triggered this build > Build Source Stamp: [branch tomcat/trunk] 1792043 > Blamelist: markt > > BUILD FAILED: failed shell_8 This is me trying to get snapshots deployed to the ASF Maven snaphsot repo with every build. The current problem is that the Maven Ant tasks we need aren't on the build slave. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2328 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1792043 Blamelist: markt BUILD FAILED: failed shell_8 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: regarding logging practice in tomcat source
On 20/04/17 12:25, Hoa Phan wrote:
> Hi,
>
> I've been wondering if the condition guarding log statement in tomcat src
> like:
>
> if (log.isDebugEnabled()) log.debug("[4] Backup becoming primary");
>
>
> Is it on purpose, for performance sake or just legacy code.
>
> Would the string inside get GC or st?
Generally, that construct is for performance since creating the debug
message is much more expensive (particularly as soon as you use i18n for
all your log messages) than the isDebugEnabled() test.
For the specific example you quoted, it won't matter very much but I
still prefer that style because:
a) it means the logging code is consistent throughout the code base
b) if / when it is changed to use a more complex logging message we
don't need to remember to add the test.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792043 - /tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
Author: markt
Date: Thu Apr 20 11:53:16 2017
New Revision: 1792043
URL: http://svn.apache.org/viewvc?rev=1792043&view=rev
Log:
Whitespace clean up
Trivial commit to test CI system
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1792043&r1=1792042&r2=1792043&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Apr
20 11:53:16 2017
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.ant;
-
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +29,6 @@ import org.apache.tomcat.util.codec.bina
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-
/**
* Abstract base class for Ant tasks that interact with the
* Manager web application for dynamically deploying and
@@ -43,10 +39,8 @@ import org.apache.tools.ant.Project;
*/
public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
-
// - Instance Variables
-
/**
* manager webapp's encoding.
*/
@@ -55,7 +49,6 @@ public abstract class AbstractCatalinaTa
// - Properties
-
/**
* The charset used during URL encoding.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
regarding logging practice in tomcat source
Hi,
I've been wondering if the condition guarding log statement in tomcat src
like:
if (log.isDebugEnabled()) log.debug("[4] Backup becoming primary");
Is it on purpose, for performance sake or just legacy code.
Would the string inside get GC or st?
Thanks.
Regards,
svn commit: r1792038 - in /tomcat/trunk/res/maven: mvn-pub.xml mvn.properties.default
Author: markt
Date: Thu Apr 20 10:38:33 2017
New Revision: 1792038
URL: http://svn.apache.org/viewvc?rev=1792038&view=rev
Log:
Additional tweaks to pick up credentials from the settings.xml used by the CI
system.
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/mvn.properties.default
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1792038&r1=1792037&r2=1792038&view=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Apr 20 10:38:33 2017
@@ -17,7 +17,8 @@
-->
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless">
@@ -64,15 +65,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -126,9 +128,10 @@
-
+
+password="${asf.ldap.password}"
+unless:set="maven.auth.useSettings"/>
@@ -184,16 +187,17 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -364,7 +368,7 @@
-
+
Modified: tomcat/trunk/res/maven/mvn.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1792038&r1=1792037&r2=1792038&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 20 10:38:33 2017
@@ -24,15 +24,19 @@
#running this script
asf.ldap.username=
gpg.exec=C:/software/GNU/GnuPG/gpg.exe
+# Set this property to use the user name and password from the Maven
+# settings.xml file rather than from asf.ldap.username and prompting for the
+# associated password
+# maven.auth.useSettings=Anything
# ASF Snapshot Repository (hosted on Nexus)
maven.snapshot.repo.url=https://repository.apache.org/content/repositories/snapshots
-maven.snapshot.repo.repositoryId=apache.snapshots
+maven.snapshot.repo.repositoryId=apache.snapshots.https
# ASF Release Repository (hosted on Nexus)
# Note: Also used for staging releases prior to voting
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven.asf.release.repo.repositoryId=apache.releases
+maven.asf.release.repo.repositoryId=apache.releases.https
# Release version info
maven.asf.release.deploy.version=9.0.0.M21
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792035 - in /tomcat/tc8.5.x/trunk: ./ res/maven/mvn-pub.xml webapps/docs/changelog.xml
Author: markt Date: Thu Apr 20 09:56:28 2017 New Revision: 1792035 URL: http://svn.apache.org/viewvc?rev=1792035&view=rev Log: Modify the Ant build script used to publish to a Maven repository so that it no longer requires artifacts to be GPG signed. This is make it possible for the CI system to upload snapshot builds to the ASF Maven repository. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 20 09:56:28 2017 @@ -1 +1 @@ -/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,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,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,1747404,1747506,1747536,1747 924,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-1756289,1756408-1756410,1 756778,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-1762053,1762123,1762168,176217 2,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,1763
[Bug 60362] Missing reason phrase in response
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362 --- Comment #53 from Mark Thomas --- (In reply to Blazej Bucko from comment #52) > They were not broken according to the first RFC. They broke around 2014 when > new RFC was published. Nope. From RFC 2616 (dated 1999): Reason-Phrase = * The text around section 6.1.1 suggests that reason phrases will normally be non-zero length but the ABNF is clear that zero length reason phrases are valid (and should therefore be accepted by spec compliant user agents). -- 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: r1792033 - in /tomcat/trunk: res/maven/mvn-pub.xml webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 20 09:31:26 2017
New Revision: 1792033
URL: http://svn.apache.org/viewvc?rev=1792033&view=rev
Log: (empty)
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1792033&r1=1792032&r2=1792033&view=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Apr 20 09:31:26 2017
@@ -16,7 +16,8 @@
limitations under the License.
-->
+ xmlns:artifact="urn:maven-artifact-ant"
+ xmlns:if="ant:if">
@@ -49,35 +50,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -85,10 +69,10 @@
-
+
-
-
+
+
@@ -131,26 +115,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -158,8 +130,8 @@
-
-
+
+
@@ -198,35 +170,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -235,10 +190,10 @@
password="${asf.ldap.password}"/>
-
+
-
-
+
+
@@ -262,7 +217,7 @@
-
+
-
+
+
+
+
+
@@ -412,4 +371,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1792033&r1=1792032&r2=1792033&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 20 09:31:26 2017
@@ -90,6 +90,16 @@
+
+
+
+Modify the Ant build script used to publish to a Maven repository so
+that it no longer requires artifacts to be GPG signed. This is make it
+possible for the CI system to upload snapshot builds to the ASF Maven
+repository. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60362] Missing reason phrase in response
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362 --- Comment #52 from Blazej Bucko --- They were not broken according to the first RFC. They broke around 2014 when new RFC was published. -- 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
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2325 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1792023 Blamelist: kfujino Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2324 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1792022 Blamelist: kfujino 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: r1792023 - in /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors: ThroughputInterceptor.java ThroughputInterceptorMBean.java
Author: kfujino
Date: Thu Apr 20 07:40:27 2017
New Revision: 1792023
URL: http://svn.apache.org/viewvc?rev=1792023&view=rev
Log:
Add getInterval method to ThroughputInterceptorMBean.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptorMBean.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?rev=1792023&r1=1792022&r2=1792023&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
Thu Apr 20 07:40:27 2017
@@ -108,6 +108,7 @@ public class ThroughputInterceptor exten
this.interval = interval;
}
+@Override
public int getInterval() {
return interval;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptorMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptorMBean.java?rev=1792023&r1=1792022&r2=1792023&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptorMBean.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptorMBean.java
Thu Apr 20 07:40:27 2017
@@ -23,6 +23,8 @@ public interface ThroughputInterceptorMB
public int getOptionFlag();
// Attributes
+public int getInterval();
+
public void setInterval(int interval);
// stats
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792022 - /tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
Author: kfujino
Date: Thu Apr 20 07:33:36 2017
New Revision: 1792022
URL: http://svn.apache.org/viewvc?rev=1792022&view=rev
Log:
fololow-up r1792021.
Avoid InstanceAlreadyExistsException.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java?rev=1792022&r1=1792021&r2=1792022&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/jmx/JmxRegistry.java Thu Apr
20 07:33:36 2017
@@ -97,6 +97,9 @@ public class JmxRegistry {
ObjectName oName = null;
try {
oName = new ObjectName(oNameStr);
+if (mbserver.isRegistered(oName)) {
+mbserver.unregisterMBean(oName);
+}
mbserver.registerMBean(bean, oName);
} catch (NotCompliantMBeanException e) {
log.warn(sm.getString("jmxRegistry.registerJmx.notCompliant",
bean), e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1792021 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java java/org/apache/catalina/tribes/group/interceptors/StaticMembershipIntercep
Author: kfujino
Date: Thu Apr 20 07:30:15 2017
New Revision: 1792021
URL: http://svn.apache.org/viewvc?rev=1792021&view=rev
Log:
Add MBean for StaticMembershipInterceptor.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1792021&r1=1792020&r2=1792021&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
Thu Apr 20 07:30:15 2017
@@ -32,7 +32,8 @@ import org.apache.catalina.tribes.util.S
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-public class StaticMembershipInterceptor extends ChannelInterceptorBase {
+public class StaticMembershipInterceptor extends ChannelInterceptorBase
+implements StaticMembershipInterceptorMBean {
private static final Log log =
LogFactory.getLog(StaticMembershipInterceptor.class);
protected static final StringManager sm =
Added:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.java?rev=1792021&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.java
Thu Apr 20 07:30:15 2017
@@ -0,0 +1,26 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.tribes.group.interceptors;
+
+import org.apache.catalina.tribes.Member;
+
+public interface StaticMembershipInterceptorMBean {
+
+public int getOptionFlag();
+
+public Member getLocalMember(boolean incAlive);
+}
\ No newline at end of file
Propchange:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.java
--
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1792021&r1=1792020&r2=1792021&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 20 07:30:15 2017
@@ -85,8 +85,8 @@
Add JMX support for Channel Interceptors.ãThe
Interceptors
that implement jmx support are TcpFailureDetector,
-ThroughputInterceptor and TcpPingInterceptor.
-(kfujino)
+ThroughputInterceptor, TcpPingInterceptor and
+StaticMembershipInterceptor. (kfujino)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
