[jbossweb-commits] JBossWeb SVN: r1078 - in trunk/java/org/apache/catalina: startup and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2009-06-03 11:47:47 -0400 (Wed, 03 Jun 2009)
New Revision: 1078
Modified:
trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java
trunk/java/org/apache/catalina/startup/ContextConfig.java
Log:
- Add another path field.
Modified: trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java
===================================================================
--- trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-06-03 14:05:53 UTC
(rev 1077)
+++ trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-06-03 15:47:47 UTC
(rev 1078)
@@ -84,8 +84,16 @@
*/
protected String info; // optional
+ /**
+ * The location of the taglib, which should be the JAR path, or empty if exploded.
+ */
protected String location;
+ /**
+ * The access path for the taglib, relative to the location.
+ */
+ protected String path;
+
public String getPrefix() {
return prefix;
}
@@ -190,4 +198,12 @@
this.location = location;
}
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
}
Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-06-03 14:05:53 UTC (rev
1077)
+++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-06-03 15:47:47 UTC (rev
1078)
@@ -630,6 +630,7 @@
tldDigester.reset();
}
tagLibraryInfo.setLocation("");
+ tagLibraryInfo.setPath(tldPath);
context.addJspTagLibrary(tagLibraryInfo);
}
}
@@ -661,7 +662,8 @@
jarFile = new JarFile(jarPath);
Iterator<String> jarTLDsIterator = TLDs.get(jarPath).iterator();
while (jarTLDsIterator.hasNext()) {
- stream =
jarFile.getInputStream(jarFile.getEntry(jarTLDsIterator.next()));
+ String tldPath = jarTLDsIterator.next();
+ stream = jarFile.getInputStream(jarFile.getEntry(tldPath));
synchronized (tldDigester) {
TagLibraryInfo tagLibraryInfo = new TagLibraryInfo();
try {
@@ -678,6 +680,7 @@
}
}
tagLibraryInfo.setLocation(jarPath);
+ tagLibraryInfo.setPath(tldPath);
context.addJspTagLibrary(tagLibraryInfo);
}
}