Author: markt
Date: Tue Jul 9 09:01:11 2013
New Revision: 1501143
URL: http://svn.apache.org/r1501143
Log:
Consistency
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1501143&r1=1501142&r2=1501143&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
Tue Jul 9 09:01:11 2013
@@ -47,6 +47,6 @@ webXml.mergeConflictSessionTimeout=The s
webXml.mergeConflictSessionTrackingMode=The session tracking modes were
defined inconsistently in multiple fragments including fragment with name [{0}]
located at [{1}]
webXml.mergeConflictString=The [{0}] with name [{1}] was defined
inconsistently in multiple fragments including fragment with name [{2}] located
at [{3}]
webXml.multipleOther=Multiple others entries in ordering
-webxml.unrecognisedPublicId=The public ID [{0}] did not match any of the known
public ID's for web.xml files so the version could not be identified
+webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known
public ID's for web.xml files so the version could not be identified
webXml.version.nfe=Unable to parse [{0}] from the version string [{1}]. This
component of the version string will be ignored.
webXml.wrongFragmentName=Used a wrong fragment name {0} at web.xml
absolute-ordering tag!
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1501143&r1=1501142&r2=1501143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Tue Jul
9 09:01:11 2013
@@ -213,7 +213,7 @@ public class WebXml {
// traced back. Ignore it.
} else {
// Unrecognised publicId
- log.warn(sm.getString("webxml.unrecognisedPublicId", publicId));
+ log.warn(sm.getString("webXml.unrecognisedPublicId", publicId));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
