luehe 2002/09/27 13:18:32
Modified: jasper2/src/share/org/apache/jasper/compiler
TagFileProcessor.java TagLibraryInfoImpl.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_ja.properties
Log:
Let parse exception from packaged tag files propagate up
Revision Changes Path
1.28 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TagFileProcessor.java 12 Sep 2002 20:48:17 -0000 1.27
+++ TagFileProcessor.java 27 Sep 2002 20:18:31 -0000 1.28
@@ -193,13 +193,13 @@
// type is fixed to "JspFragment" and a translation error
// must occur if specified.
if (type != null) {
- err.jspError("jsp.error.fragmentwithtype");
+ err.jspError(n, "jsp.error.fragmentwithtype");
}
// rtexprvalue is fixed to "true" and a translation error
// must occur if specified.
rtexprvalue = true;
if( rtexprvalueString != null ) {
- err.jspError("jsp.error.frgmentwithrtexprvalue" );
+ err.jspError(n, "jsp.error.frgmentwithrtexprvalue" );
}
} else {
if (type == null)
1.15 +4 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TagLibraryInfoImpl.java 28 Aug 2002 23:00:19 -0000 1.14
+++ TagLibraryInfoImpl.java 27 Sep 2002 20:18:32 -0000 1.15
@@ -226,10 +226,6 @@
// it to release the cached entry, so
// there's no way to redeploy from the same JAR file. Wierd.
} catch (Exception ex) {
- Constants.message(
- "jsp.error.taglib.jarFileException",
- new Object[] {url.toString(), ex.getMessage()},
- Logger.ERROR);
if (stream != null) {
try {
stream.close();
@@ -240,6 +236,7 @@
jarFile.close();
} catch (Throwable t) {}
}
+ throw new JasperException(ex);
}
}
}
1.43 +1 -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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- messages.properties 24 Sep 2002 21:24:58 -0000 1.42
+++ messages.properties 27 Sep 2002 20:18:32 -0000 1.43
@@ -253,7 +253,6 @@
#jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}> cannot
have template data. Template data must be encapsulated within a <jsp:cdata>
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}> cannot
have template data. Template data must be encapsulated within a <jsp:text>
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
#Error while processing taglib jar file {0}: {1}
-jsp.error.taglib.jarFileException=
jsp.error.taglib.reserved.prefix=The taglib prefix {0} is reserved
jsp.error.invalid.javaEncoding=Invalid java encodings. Tried {0} and then {1}. Both
failed.
jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on your
java platform. An alternate can be specified via the 'javaEncoding' parameter of
JspServlet.
1.14 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages_ja.properties 24 Sep 2002 21:24:58 -0000 1.13
+++ messages_ja.properties 27 Sep 2002 20:18:32 -0000 1.14
@@ -232,7 +232,6 @@
#jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}> cannot
have template data. Template data must be encapsulated within a <jsp:cdata>
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
jspx.error.templateDataNotInJspCdata=\u8a3c\u660e\u30a8\u30e9\u30fc:
\u8981\u7d20<{0}>\u306f\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30fc\u30bf\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30fc\u30bf\u306f\u3001<jsp:text>\u8981\u7d20\u306e\u4e2d\u3067\u96a0\u853d\u3055\u308c\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002[JSP1.2
PFD
5.1.9]\n\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c7\u30fc\u30bf\u306e\u30a8\u30e9\u30fc\u3067\u3059:
{1}
#Error while processing taglib jar file {0}: {1}
-jsp.error.taglib.jarFileException=
jsp.error.taglib.reserved.prefix=
jsp.error.unterminated.user.tag=\u7d42\u4e86\u3057\u3066\u3044\u306a\u3044\u30e6\u30fc\u30b6\u5b9a\u7fa9\u30bf\u30b0:
\u7d42\u4e86\u30bf\u30b0 {0}
\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u304b\u3001\u30cd\u30b9\u30c8\u306e\u9593\u9055\u3044\u3067\u3059\u3002
jsp.error.invalid.javaEncoding=\u7121\u52b9\u306aJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059\u3002{0}\u3092\u8a66\u3057\u3066\u3001\u305d\u308c\u304b\u3089{1}\u3092\u8a66\u3057\u307e\u3057\u305f\u304c\u3001\u4e21\u65b9\u304c\u5931\u6557\u3057\u307e\u3057\u305f
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
