Author: violetagg
Date: Mon Apr 4 08:19:18 2016
New Revision: 1737633
URL: http://svn.apache.org/viewvc?rev=1737633&view=rev
Log:
Merged revision 1737632 from tomcat/trunk:
Clarify in the log message that specifying both urlPatterns and value
attributes in WebServlet and WebFilter annotations is not allowed.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
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/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 4 08:19:18 2016
@@ -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
+/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
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1737633&r1=1737632&r2=1737633&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Apr 4 08:19:18 2016
@@ -2317,7 +2317,7 @@ public class ContextConfig implements Li
if ("value".equals(name) || "urlPatterns".equals(name)) {
if (urlPatternsSet) {
throw new IllegalArgumentException(sm.getString(
- "contextConfig.urlPatternValue", className));
+ "contextConfig.urlPatternValue", "WebServlet",
className));
}
urlPatternsSet = true;
urlPatterns = processAnnotationsStringArray(evp.getValue());
@@ -2429,7 +2429,7 @@ public class ContextConfig implements Li
if ("value".equals(name) || "urlPatterns".equals(name)) {
if (urlPatternsSet) {
throw new IllegalArgumentException(sm.getString(
- "contextConfig.urlPatternValue", className));
+ "contextConfig.urlPatternValue", "WebFilter",
className));
}
urlPatterns = processAnnotationsStringArray(evp.getValue());
urlPatternsSet = urlPatterns.length > 0;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1737633&r1=1737632&r2=1737633&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Apr 4 08:19:18 2016
@@ -69,7 +69,7 @@ contextConfig.start=ContextConfig: Proce
contextConfig.stop=ContextConfig: Processing STOP
contextConfig.unavailable=Marking this application unavailable due to previous
error(s)
contextConfig.unknownUrlProtocol=The URL protocol [{0}] was not recognised
during annotation processing. URL [{1}] was ignored.
-contextConfig.urlPatternValue=Both the UrlPattern and value attribute were set
for the WebServlet annotation on class [{0}]
+contextConfig.urlPatternValue=Both the urlPatterns and value attributes were
set for the {0} annotation on class [{1}]
contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]
contextConfig.xmlSettings=Context [{0}] will parse web.xml and
web-fragment.xml files with validation:{1} and namespaceAware:{2}
embedded.noEngines=No engines have been defined yet
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1737633&r1=1737632&r2=1737633&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Mon Apr 4 08:19:18 2016
@@ -56,7 +56,7 @@ contextConfig.start = "ContextConfig"\:
contextConfig.stop = "ContextConfig"\: Procesando "STOP"
contextConfig.unavailable = Esta aplicaci\u00F3n est\u00E1 marcada como no
disponible debido a los errores precedentes
contextConfig.unknownUrlProtocol = El protocolo de URL [{0}] no fue reconocido
durante el proceso de anotaciones. Se ignor\u00F3 la URL [{1}].
-contextConfig.urlPatternValue = Ambis valores de UrlPattern y atributo fuerno
puestos para anotaci\u00F3n de WebServlet de la clase [{0}]
+contextConfig.urlPatternValue = Ambis valores de urlPatterns y atributo fuerno
puestos para anotaci\u00F3n de {0} de la clase [{1}]
contextConfig.webinfClassesUrl = No pude determinar la URL para WEB-INF/classes
contextConfig.xmlSettings = El contexto [{0}] analizar\u00E1 los ficheros
web.xml y web-fragment.xml con validaci\u00F3n\:{1} y namespaceAware\:{2}
embedded.noEngines = Alg\u00FAn motor (engine) no ha sido a\u00FAn definido
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=1737633&r1=1737632&r2=1737633&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Apr 4 08:19:18 2016
@@ -81,6 +81,11 @@
<bug>59256</bug>: <code>slf4j-taglib*.jar</code> should not be excluded
from the standard JAR scanning by default. (violetagg)
</fix>
+ <fix>
+ Clarify in the log message that specifying both urlPatterns and value
+ attributes in WebServlet and WebFilter annotations is not allowed.
+ (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
