luehe 2004/06/25 12:04:23
Modified: jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
Reverted fix for Bugzilla 29763 ("The encoding of jsp document").
We're supposed to throw an error only if there is an encoding declaration in the XML
prolog that does not match the page encoding from the page directive or jsp-config. We
must not throw any error if there is no XML prolog or encoding declaration in the
prolog.
The motivation for this is to make sure that JSP 1.2 pages with a page directive
specifying a page encoding other than the default will continue to work in JSP 2.0 in
most cases.
The code is currently going through lots of pains to determine whether the encoding
was specified in the XML prolog, or autodetected, to decide whether an error should be
thrown.
Revision Changes Path
1.148 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- messages.properties 24 Jun 2004 19:05:12 -0000 1.147
+++ messages.properties 25 Jun 2004 19:04:23 -0000 1.148
@@ -327,7 +327,7 @@
jsp.error.tagdirective.badbodycontent=Invalid body-content ({0}) in tag directive
jsp.error.simpletag.badbodycontent=The TLD for the class {0} specifies an invalid
body-content (JSP) for a SimpleTag.
jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in
jsp-property-group ({0}) is different from that specified in page directive ({1})
-jsp.error.prolog_pagedir_encoding_mismatch=Page-encoding derived from XML prolog
({0}) is different from that specified in page directive ({1})
+jsp.error.prolog_pagedir_encoding_mismatch=Page-encoding specified in XML prolog
({0}) is different from that specified in page directive ({1})
jsp.error.prolog_config_encoding_mismatch=Page-encoding specified in XML prolog
({0}) is different from that specified in jsp-property-group ({1})
jsp.error.attribute.custom.non_rt_with_expr=According to TLD or attribute directive
in tag file, attribute {0} does not accept any expressions
jsp.error.attribute.standard.non_rt_with_expr=The {0} attribute of the {1} standard
action does not accept any expressions
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
