Author: markt
Date: Thu Nov 14 16:25:58 2013
New Revision: 1541954
URL: http://svn.apache.org/r1541954
Log:
Check-point (TLD support broken)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1541954&r1=1541953&r2=1541954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Thu
Nov 14 16:25:58 2013
@@ -47,7 +47,6 @@ import javax.servlet.jsp.tagext.Variable
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.util.ExceptionUtils;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
@@ -156,7 +155,6 @@ class TagLibraryInfoImpl extends TagLibr
this.parserController = pc;
this.pi = pi;
this.err = err;
- InputStream in = null;
if (tldResourcePath == null) {
// The URI points to the TLD itself or to a JAR file in which the
@@ -164,53 +162,30 @@ class TagLibraryInfoImpl extends TagLibr
tldResourcePath = generateTldResourcePath(uri, ctxt);
}
- Jar jar;
- try {
- jar = tldResourcePath.getJar();
- } catch (IOException ioe) {
- throw new JasperException(ioe);
- }
- try {
- if (jar == null) {
- String tldName = tldResourcePath.getWebappPath();
- try {
- in = getResourceAsStream(tldName);
- if (in == null) {
- throw new FileNotFoundException(tldName);
- }
- } catch (FileNotFoundException ex) {
- err.jspError(mark, "jsp.error.file.not.found", tldName);
- }
- parseTLD(tldName, in, null);
- // Add TLD to dependency list
- PageInfo pageInfo = ctxt.createCompiler().getPageInfo();
- if (pageInfo != null) {
- pageInfo.addDependant(tldName,
- ctxt.getLastModified(tldName));
- }
- } else {
- // Tag library is packaged in JAR file
- String tldName = tldResourcePath.getEntryName();
- String uriExternal = jar.getJarFileURL().toExternalForm();
- try {
- in = jar.getInputStream(tldName);
- parseTLD(uriExternal + "!/" + tldName, in, jar);
- } catch (Exception ex) {
- err.jspError(mark, ex, "jsp.error.tld.unable_to_read",
- uriExternal, tldName, ex.toString());
- }
+ PageInfo pageInfo = ctxt.createCompiler().getPageInfo();
+ if (pageInfo != null) {
+ Jar jar;
+ try {
+ jar = tldResourcePath.getJar();
+ } catch (IOException ioe) {
+ throw new JasperException(ioe);
}
- } finally {
- if (in != null) {
+
+ String path = tldResourcePath.getWebappPath();
+ // Add TLD (jar==null) / JAR (jar!=null) file to dependency list
+ pageInfo.addDependant(path, ctxt.getLastModified(path));
+ if (jar != null) {
+ // Add TLD within the JAR to the dependency list
+ String entryName = tldResourcePath.getEntryName();
try {
- in.close();
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
+ pageInfo.addDependant(jar.getURL(entryName),
+ Long.valueOf(jar.getLastModified(entryName)));
+ } catch (IOException ioe) {
+ throw new JasperException(ioe);
}
}
}
-
}
/*
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=1541954&r1=1541953&r2=1541954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu
Nov 14 16:25:58 2013
@@ -138,7 +138,6 @@ jsp.error.parse.error.in.TLD=Parse Error
jsp.error.file.not.found=File \"{0}\" not found
jsp.error.missing_attribute=According to the TLD or the tag file, attribute
{0} is mandatory for tag {1}
jsp.error.bad_attribute=Attribute {0} invalid for tag {1} according to TLD
-jsp.error.tld.unable_to_read=Unable to read TLD \"{1}\" from JAR file \"{0}\":
{2}
jsp.error.tld.unable_to_get_jar=Unable to get JAR resource \"{0}\" containing
TLD: {1}
jsp.error.tld.missing_jar=Missing JAR resource \"{0}\" containing TLD
jsp.error.unable.to_find_method=Unable to find setter method for attribute: {0}
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1541954&r1=1541953&r2=1541954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Thu Nov 14 16:25:58 2013
@@ -136,7 +136,6 @@ jsp.error.parse.error.in.TLD = Error de
jsp.error.file.not.found = Archivo JSP "{0}" no encontrado
jsp.error.missing_attribute = De acuerdo con el TLD el atributo {0} es
obligatorio para el tag {1}
jsp.error.bad_attribute = El atributo {0} no es v\u00E1lido seg\u00FAn el TLD
especificado
-jsp.error.tld.unable_to_read = Imposible de leer TLD "{1}" desde archivo JAR
"{0}"\: {2}
jsp.error.tld.unable_to_get_jar = Imposible obtener recurso JAR "{0}"
conteniendo TLD\: {1}
jsp.error.tld.missing_jar = Falta recurso JAR "{0}" conteniendo TLD
jsp.error.unable.to_find_method = No se puede encontrar el m\u00E9todo de
escritura para el atributo\: {0}
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1541954&r1=1541953&r2=1541954&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Thu Nov 14 16:25:58 2013
@@ -120,7 +120,6 @@ jsp.error.parse.error.in.TLD=\u30bf\u30b
jsp.error.file.not.found=JSP \u30d5\u30a1\u30a4\u30eb \"{0}\"
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
jsp.error.missing_attribute=TLD\u53c8\u306f\u30bf\u30b0\u30d5\u30a1\u30a4\u30eb\u306b\u3088\u308b\u3068\u3001\u5c5e\u6027
{0} \u306f\u30bf\u30b0 {1} \u306b\u306f\u5fc5\u9808\u3067\u3059
jsp.error.bad_attribute=TLD\u306b\u3088\u308b\u3068\u3001\u30bf\u30b0 {1}
\u306e\u5c5e\u6027 {0} \u306f\u7121\u52b9\u3067\u3059
-jsp.error.tld.unable_to_read=JAR\u30d5\u30a1\u30a4\u30eb \"{0}\"
\u304b\u3089TLD \"{1}\" \u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093: {2}
jsp.error.tld.unable_to_get_jar=TLD\u3092\u542b\u3080JAR\u30ea\u30bd\u30fc\u30b9
\"{0}\" \u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093 : {1}
jsp.error.tld.missing_jar=TLD\u3092\u542b\u3080JAR\u30ea\u30bd\u30fc\u30b9
\"{0}\" \u304c\u3042\u308a\u307e\u305b\u3093
jsp.error.unable.to_find_method=\u5c5e\u6027 {0}
\u306esetter\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
