Author: remy.maucherat(a)jboss.com
Date: 2009-01-07 10:37:49 -0500 (Wed, 07 Jan 2009)
New Revision: 896
Modified:
trunk/PATCHES.txt
trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
trunk/java/org/apache/jasper/compiler/JspUtil.java
trunk/java/org/apache/jasper/compiler/ParserController.java
trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
trunk/webapps/docs/changelog.xml
Log:
- Use a jar url in a tag id.
Modified: trunk/PATCHES.txt
===================================================================
--- trunk/PATCHES.txt 2009-01-06 16:31:23 UTC (rev 895)
+++ trunk/PATCHES.txt 2009-01-07 15:37:49 UTC (rev 896)
@@ -37,3 +37,6 @@
728947
Lame IE 6 and 7 cookie hack for expires.
+
+various
+New JDBC pool module
Modified: trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java 2009-01-06 16:31:23
UTC (rev 895)
+++ trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java 2009-01-07 15:37:49
UTC (rev 896)
@@ -194,6 +194,7 @@
tagInfo = TagFileProcessor.parseTagFileDirectives(pc,
shortName,
path,
+ pc.getJspCompilationContext().getTagFileJarUrl(path),
this);
} catch (JasperException je) {
throw new RuntimeException(je.toString(), je);
Modified: trunk/java/org/apache/jasper/compiler/JspUtil.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-01-06 16:31:23 UTC (rev 895)
+++ trunk/java/org/apache/jasper/compiler/JspUtil.java 2009-01-07 15:37:49 UTC (rev 896)
@@ -835,16 +835,38 @@
/**
* Gets the fully-qualified class name of the tag handler corresponding to
* the given tag file path.
- *
- * @param path Tag file path
- * @param err Error dispatcher
- *
- * @return Fully-qualified class name of the tag handler corresponding to
- * the given tag file path
+ *
+ * @param path
+ * Tag file path
+ * @param err
+ * Error dispatcher
+ *
+ * @return Fully-qualified class name of the tag handler corresponding to
+ * the given tag file path
+ *
+ * @deprecated Use {@link #getTagHandlerClassName(String, String,
+ * ErrorDispatcher)
+ * See
https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
*/
- public static String getTagHandlerClassName(String path,
- ErrorDispatcher err)
- throws JasperException {
+ public static String getTagHandlerClassName(String path, ErrorDispatcher err)
+ throws JasperException {
+ return getTagHandlerClassName(path, null, err);
+ }
+
+ /**
+ * Gets the fully-qualified class name of the tag handler corresponding to
+ * the given tag file path.
+ *
+ * @param path
+ * Tag file path
+ * @param err
+ * Error dispatcher
+ *
+ * @return Fully-qualified class name of the tag handler corresponding to
+ * the given tag file path
+ */
+ public static String getTagHandlerClassName(String path, String urn,
+ ErrorDispatcher err) throws JasperException {
String className = null;
int begin = 0;
@@ -872,7 +894,7 @@
} else {
index = path.indexOf(META_INF_TAGS);
if (index != -1) {
- className = "org.apache.jsp.tag.meta.";
+ className = getClassNameBase(urn);
begin = index + META_INF_TAGS.length();
} else {
err.jspError("jsp.error.tagfile.illegalPath", path);
@@ -884,6 +906,15 @@
return className;
}
+ private static String getClassNameBase(String urn) {
+ StringBuffer base = new StringBuffer("org.apache.jsp.tag.meta.");
+ if (urn != null) {
+ base.append(makeJavaPackage(urn));
+ base.append('.');
+ }
+ return base.toString();
+ }
+
/**
* Converts the given path to a Java package or fully-qualified class name
*
Modified: trunk/java/org/apache/jasper/compiler/ParserController.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/ParserController.java 2009-01-06 16:31:23 UTC
(rev 895)
+++ trunk/java/org/apache/jasper/compiler/ParserController.java 2009-01-07 15:37:49 UTC
(rev 896)
@@ -143,20 +143,37 @@
* This is invoked by the compiler
*
* @param inFileName The name of the tag file to be parsed.
+ * @deprecated Use {@link #parseTagFileDirectives(String, URL)}
+ * See
https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
*/
public Node.Nodes parseTagFileDirectives(String inFileName)
throws FileNotFoundException, JasperException, IOException {
+ return parseTagFileDirectives(
+ inFileName, ctxt.getTagFileJarUrl(inFileName));
+ }
+
+ /**
+ * Extracts tag file directive information from the given tag file.
+ *
+ * This is invoked by the compiler
+ *
+ * @param inFileName The name of the tag file to be parsed.
+ * @param tagFileJarUrl The location of the tag file.
+ */
+ public Node.Nodes parseTagFileDirectives(String inFileName,
+ URL tagFileJarUrl)
+ throws FileNotFoundException, JasperException, IOException {
boolean isTagFileSave = isTagFile;
boolean directiveOnlySave = directiveOnly;
isTagFile = true;
directiveOnly = true;
- Node.Nodes page = doParse(inFileName, null,
- ctxt.getTagFileJarUrl(inFileName));
+ Node.Nodes page = doParse(inFileName, null, tagFileJarUrl);
directiveOnly = directiveOnlySave;
isTagFile = isTagFileSave;
return page;
}
+
/**
* Parses the JSP page or tag file with the given path name.
*
Modified: trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2009-01-06 16:31:23 UTC
(rev 895)
+++ trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2009-01-07 15:37:49 UTC
(rev 896)
@@ -19,11 +19,13 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.net.URLClassLoader;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import java.util.HashMap;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
@@ -37,8 +39,8 @@
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.runtime.JspSourceDependent;
import org.apache.jasper.servlet.JspServletWrapper;
-import org.apache.jasper.runtime.JspSourceDependent;
/**
* 1. Processes and extracts the directive info in a tag file. 2. Compiles and
@@ -379,7 +381,8 @@
bodycontent = TagInfo.BODY_CONTENT_SCRIPTLESS;
}
- String tagClassName = JspUtil.getTagHandlerClassName(path, err);
+ String tagClassName = JspUtil.getTagHandlerClassName(
+ path, tagLibInfo.getReliableURN(), err);
TagVariableInfo[] tagVariableInfos = new TagVariableInfo[variableVector
.size()];
@@ -502,16 +505,47 @@
* @param tagLibInfo
* the TagLibraryInfo object associated with this TagInfo
* @return a TagInfo object assembled from the directives in the tag file.
+ * @deprecated Use {@link TagFileProcessor#parseTagFileDirectives(
+ * ParserController, String, String, URL, TagLibraryInfo)}
+ * See
https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
*/
public static TagInfo parseTagFileDirectives(ParserController pc,
String name, String path, TagLibraryInfo tagLibInfo)
throws JasperException {
+ return parseTagFileDirectives(pc, name, path,
+ pc.getJspCompilationContext().getTagFileJarUrl(path),
+ tagLibInfo);
+ }
+
+ /**
+ * Parses the tag file, and collects information on the directives included
+ * in it. The method is used to obtain the info on the tag file, when the
+ * handler that it represents is referenced. The tag file is not compiled
+ * here.
+ *
+ * @param pc
+ * the current ParserController used in this compilation
+ * @param name
+ * the tag name as specified in the TLD
+ * @param tagfile
+ * the path for the tagfile
+ * @param tagFileJarUrl
+ * the url for the Jar containign the tag file
+ * @param tagLibInfo
+ * the TagLibraryInfo object associated with this TagInfo
+ * @return a TagInfo object assembled from the directives in the tag file.
+ */
+ public static TagInfo parseTagFileDirectives(ParserController pc,
+ String name, String path, URL tagFileJarUrl, TagLibraryInfo tagLibInfo)
+ throws JasperException {
+
+
ErrorDispatcher err = pc.getCompiler().getErrorDispatcher();
Node.Nodes page = null;
try {
- page = pc.parseTagFileDirectives(path);
+ page = pc.parseTagFileDirectives(path, tagFileJarUrl);
} catch (FileNotFoundException e) {
err.jspError("jsp.error.file.not.found", path);
} catch (IOException e) {
@@ -526,26 +560,44 @@
return tagFileVisitor.getTagInfo();
}
+
/**
* Compiles and loads a tagfile.
*/
private Class loadTagFile(Compiler compiler, String tagFilePath,
TagInfo tagInfo, PageInfo parentPageInfo) throws JasperException {
+ URL tagFileJarUrl = null;
+ if (tagFilePath.startsWith("/META-INF/")) {
+ try {
+ tagFileJarUrl = new URL("jar:" +
+ compiler.getCompilationContext().getTldLocation(
+ tagInfo.getTagLibrary().getURI())[0] + "!/");
+ } catch (MalformedURLException e) {
+ // Ignore ...
+ }
+ }
+ String tagFileJarPath;
+ if (tagFileJarUrl == null) {
+ tagFileJarPath = "";
+ } else {
+ tagFileJarPath = tagFileJarUrl.toString();
+ }
+
JspCompilationContext ctxt = compiler.getCompilationContext();
JspRuntimeContext rctxt = ctxt.getRuntimeContext();
- JspServletWrapper wrapper = (JspServletWrapper) rctxt
- .getWrapper(tagFilePath);
+ JspServletWrapper wrapper = rctxt.getWrapper(tagFileJarPath + tagFilePath);
synchronized (rctxt) {
if (wrapper == null) {
wrapper = new JspServletWrapper(ctxt.getServletContext(), ctxt
.getOptions(), tagFilePath, tagInfo, ctxt
- .getRuntimeContext(), ctxt.getTagFileJarUrl(tagFilePath));
- rctxt.addWrapper(tagFilePath, wrapper);
+ .getRuntimeContext(), tagFileJarUrl);
+ rctxt.addWrapper(tagFileJarPath + tagFilePath, wrapper);
// Use same classloader and classpath for compiling tag files
- wrapper.getJspEngineContext().setClassLoader(ctxt.getClassLoader());
+ wrapper.getJspEngineContext().setClassLoader(
+ (URLClassLoader) ctxt.getClassLoader());
wrapper.getJspEngineContext().setClassPath(ctxt.getClassPath());
} else {
// Make sure that JspCompilationContext gets the latest TagInfo
Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-01-06 16:31:23 UTC
(rev 895)
+++ trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-01-07 15:37:49 UTC
(rev 896)
@@ -471,13 +471,16 @@
if (path.startsWith("/META-INF/tags")) {
// Tag file packaged in JAR
+ // See
https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
+ // This needs to be removed once all the broken code that depends on
+ // it has been removed
ctxt.setTagFileJarUrl(path, jarFileUrl);
} else if (!path.startsWith("/WEB-INF/tags")) {
err.jspError("jsp.error.tagfile.illegalPath", path);
}
TagInfo tagInfo = TagFileProcessor.parseTagFileDirectives(
- parserController, name, path, this);
+ parserController, name, path, jarFileUrl, this);
return new TagFileInfo(name, path, tagInfo);
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-01-06 16:31:23 UTC (rev 895)
+++ trunk/webapps/docs/changelog.xml 2009-01-07 15:37:49 UTC (rev 896)
@@ -75,7 +75,8 @@
Support all cookie flags in RewriteRule. (remm)
</update>
<fix>
- Remove useless normalization when getting a request dispatcher through a request.
(remm)
+ Remove useless normalization when getting a request dispatcher through a request,
and
+ refactor normalization to use the implementation in RequestUtil. (remm, markt)
</fix>
<fix>
Filter not found URI in default servlet. (remm)
@@ -121,6 +122,10 @@
<fix>
<bug>37515</bug>: Add options for 1.6 and 1.7 source and target to
JDT compiler. (markt)
</fix>
+ <fix>
+ <bug>46471</bug>: Use jar url and tag file path to uniquely ID a tag
file to prevent naming
+ clashes. (markt)
+ </fix>
</changelog>
</subsection>
</section>