Author: kkolinko
Date: Fri Oct 17 15:10:00 2014
New Revision: 1632603
URL: http://svn.apache.org/r1632603
Log:
Merged r1632601 from tomcat/trunk:
Correct typo in message key, order alphabetically - followup to r1632310
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1632601
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1632603&r1=1632602&r2=1632603&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java Fri Oct 17
15:10:00 2014
@@ -626,7 +626,7 @@ abstract class Node implements TagConsta
// name with a wildcard
if (importEntry.indexOf(';') > -1) {
throw new IllegalArgumentException(
- Localizer.getMessage("jsp.error.page.invaild.import"));
+ Localizer.getMessage("jsp.error.page.invalid.import"));
}
return importEntry.trim();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1632603&r1=1632602&r2=1632603&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Fri Oct 17 15:10:00 2014
@@ -58,9 +58,9 @@ jsp.error.page.conflict.buffer=Page dire
jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple
occurrences of 'autoFlush' with different values (old: {0}, new: {1})
jsp.error.page.invalid.autoflush=Page directive: invalid value for autoFlush
+jsp.error.page.invalid.import=Page directive: invalid value for import
jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple
occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for
isThreadSafe
-jsp.error.page.invaild.import=Page directive: invalid value for import
jsp.error.page.conflict.info=Page directive: illegal to have multiple
occurrences of 'info' with different values (old: {0}, new: {1})
jsp.error.page.invalid.info=Page directive: invalid value for info
jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple
occurrences of 'isErrorPage' with different values (old: {0}, new: {1})
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
