Author: jboynes
Date: Sun Jul 21 00:38:31 2013
New Revision: 1505245
URL: http://svn.apache.org/r1505245
Log:
Provide messages for when pre-compilation aborts
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1505245&r1=1505244&r2=1505245&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Sun
Jul 21 00:38:31 2013
@@ -215,6 +215,8 @@ jspc.webinc.insertStart=<!-- JSPC servle
jspc.error.generalException=ERROR-the file ''{0}'' generated the following
general exception:
jspc.error.fileDoesNotExist=The file argument ''{0}'' does not exist
jspc.delete.fail=Failed to delete file [{0}]
+jspc.error.invalidWebXml=Aborting pre-compilation due to errors in web.xml
+jspc.error.invalidFragment=Aborting pre-compilation due to errors in web
fragments
jsp.error.library.invalid=JSP page is invalid according to library {0}: {1}
jsp.error.tlvclass.instantiation=Failed to load or instantiate
TagLibraryValidator class: {0}
jsp.error.tlv.invalid.page=Validation error messages from TagLibraryValidator
for {0} in {1}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1505245&r1=1505244&r2=1505245&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Sun Jul
21 00:38:31 2013
@@ -130,8 +130,7 @@ public class JspCServletContext implemen
try {
URL url = getResource(Constants.WEB_XML_LOCATION);
if (!webXmlParser.parseWebXml(url, webXml, false)) {
- // TODO - message
- throw new JasperException(Localizer.getMessage(""));
+ throw new
JasperException(Localizer.getMessage("jspc.error.invalidWebXml"));
}
} catch (IOException e) {
throw new JasperException(e);
@@ -160,8 +159,7 @@ public class JspCServletContext implemen
FragmentJarScannerCallback callback = new
FragmentJarScannerCallback(webXmlParser, false);
scanner.scan(JarScanType.PLUGGABILITY, this, callback);
if (!callback.isOk()) {
- // TODO - message
- throw new JasperException(Localizer.getMessage(""));
+ throw new
JasperException(Localizer.getMessage("jspc.error.invalidFragment"));
}
return callback.getFragments();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
