Author: markt
Date: Wed Dec 10 21:15:36 2014
New Revision: 1644524
URL: http://svn.apache.org/r1644524
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57142
JSP page imports must be exposed to EL via ImportHandler
Added:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspSourceImports.java
- copied unchanged from r1644516,
tomcat/trunk/java/org/apache/jasper/runtime/JspSourceImports.java
tomcat/tc8.0.x/trunk/test/webapp/bug5nnnn/bug57142.jsp
- copied unchanged from r1642233,
tomcat/trunk/test/webapp/bug5nnnn/bug57142.jsp
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 10 21:15:36 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523
Modified: tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java?rev=1644524&r1=1644523&r2=1644524&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java Wed Dec 10 21:15:36
2014
@@ -21,18 +21,19 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @since EL 3.0
*/
public class ImportHandler {
- private List<String> packages = new ArrayList<>();
- private Map<String,Class<?>> clazzes = new HashMap<>();
- private Map<String,Class<?>> statics = new HashMap<>();
+ private List<String> packageNames = new ArrayList<>();
+ private ConcurrentHashMap<String,String> classNames = new
ConcurrentHashMap<>();
+ private Map<String,Class<?>> clazzes = new ConcurrentHashMap<>();
+ private Map<String,Class<?>> statics = new ConcurrentHashMap<>();
public ImportHandler() {
@@ -103,33 +104,20 @@ public class ImportHandler {
public void importClass(String name) throws javax.el.ELException {
- if (!name.contains(".")) {
- throw new ELException(Util.message(
- null, "importHandler.invalidClassName", name));
- }
-
- Class<?> clazz = findClass(name);
+ int lastPeriodIndex = name.lastIndexOf('.');
- if (clazz == null) {
+ if (lastPeriodIndex < 0) {
throw new ELException(Util.message(
- null, "importHandler.classNotFound", name));
+ null, "importHandler.invalidClassName", name));
}
- String simpleName = clazz.getSimpleName();
- Class<?> conflict = clazzes.get(simpleName);
+ String unqualifiedName = name.substring(lastPeriodIndex + 1);
+ String currentName = classNames.putIfAbsent(unqualifiedName, name);
- if (conflict == null) {
- // No conflict - add it
- clazzes.put(simpleName, clazz);
- } else {
- // Check for a duplicate
- if (conflict.equals(clazz)) {
- // This is a duplicate.
- // NO-OP
- } else {
- throw new ELException(Util.message(null,
- "importHandler.ambiguousImport", name,
conflict.getName()));
- }
+ if (currentName != null && !currentName.equals(name)) {
+ // Conflict. Same unqualifiedName, different fully qualified names
+ throw new ELException(Util.message(null,
+ "importHandler.ambiguousImport", name, currentName));
}
}
@@ -148,7 +136,7 @@ public class ImportHandler {
null, "importHandler.invalidPackage", name));
}
}
- packages.add(name);
+ packageNames.add(name);
}
@@ -157,27 +145,40 @@ public class ImportHandler {
return null;
}
+ // Has it been previously resolved?
Class<?> result = clazzes.get(name);
- if (result == null) {
- // Search the package imports - note there may be multiple matches
- // (which correctly triggers an error)
- for (String p : packages) {
- String className = p + '.' + name;
- Class<?> clazz = findClass(className);
- if (clazz != null) {
- if (result != null) {
- throw new ELException(Util.message(null,
- "importHandler.ambiguousImport", className,
- result.getName()));
- }
- result = clazz;
- }
+ if (result != null) {
+ return result;
+ }
+
+ // Search the class imports
+ String className = classNames.get(name);
+ if (className != null) {
+ Class<?> clazz = findClass(className);
+ if (clazz != null) {
+ clazzes.put(className, clazz);
+ return clazz;
}
- if (result != null) {
- clazzes.put(name, result);
+ }
+
+ // Search the package imports - note there may be multiple matches
+ // (which correctly triggers an error)
+ for (String p : packageNames) {
+ className = p + '.' + name;
+ Class<?> clazz = findClass(className);
+ if (clazz != null) {
+ if (result != null) {
+ throw new ELException(Util.message(null,
+ "importHandler.ambiguousImport", className,
+ result.getName()));
+ }
+ result = clazz;
}
}
+ if (result != null) {
+ clazzes.put(name, result);
+ }
return result;
}
@@ -190,8 +191,9 @@ public class ImportHandler {
private Class<?> findClass(String name) {
Class<?> clazz;
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
try {
- clazz = Class.forName(name);
+ clazz = cl.loadClass(name);
} catch (ClassNotFoundException e) {
return null;
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1644524&r1=1644523&r2=1644524&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Wed Dec
10 21:15:36 2014
@@ -31,6 +31,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -532,13 +533,13 @@ class Generator {
out.printil("private static
java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;");
out.println();
Map<String,Long> dependants = pageInfo.getDependants();
- Iterator<Entry<String,Long>> iter = dependants.entrySet().iterator();
if (!dependants.isEmpty()) {
out.printil("static {");
out.pushIndent();
out.printin("_jspx_dependants = new
java.util.HashMap<java.lang.String,java.lang.Long>(");
out.print("" + dependants.size());
out.println(");");
+ Iterator<Entry<String,Long>> iter =
dependants.entrySet().iterator();
while (iter.hasNext()) {
Entry<String,Long> entry = iter.next();
out.printin("_jspx_dependants.put(\"");
@@ -551,6 +552,55 @@ class Generator {
out.printil("}");
out.println();
}
+
+ // Static data for getImports()
+ List<String> imports = pageInfo.getImports();
+ Set<String> packages = new HashSet<>();
+ Set<String> classes = new HashSet<>();
+ for (String importName : imports) {
+ if (importName == null) {
+ continue;
+ }
+ String trimmed = importName.trim();
+ if (trimmed.endsWith(".*")) {
+ packages.add(trimmed.substring(0, trimmed.length() - 2));
+ } else {
+ classes.add(trimmed);
+ }
+ }
+ out.printil("private static final java.util.Set<java.lang.String>
_jspx_imports_packages;");
+ out.println();
+ out.printil("private static final java.util.Set<java.lang.String>
_jspx_imports_classes;");
+ out.println();
+ out.printil("static {");
+ out.pushIndent();
+ if (packages.size() == 0) {
+ out.printin("_jspx_imports_packages = null;");
+ out.println();
+ } else {
+ out.printin("_jspx_imports_packages = new java.util.HashSet<>();");
+ out.println();
+ for (String packageName : packages) {
+ out.printin("_jspx_imports_packages.add(\"");
+ out.print(packageName);
+ out.println("\");");
+ }
+ }
+ if (packages.size() == 0) {
+ out.printin("_jspx_imports_classes = null;");
+ out.println();
+ } else {
+ out.printin("_jspx_imports_classes = new java.util.HashSet<>();");
+ out.println();
+ for (String className : classes) {
+ out.printin("_jspx_imports_classes.add(\"");
+ out.print(className);
+ out.println("\");");
+ }
+ }
+ out.popIndent();
+ out.printil("}");
+ out.println();
}
/**
@@ -582,7 +632,7 @@ class Generator {
* preamble generation)
*/
private void genPreambleMethods() {
- // Method used to get compile time file dependencies
+ // Implement JspSourceDependent
out.printil("public java.util.Map<java.lang.String,java.lang.Long>
getDependants() {");
out.pushIndent();
out.printil("return _jspx_dependants;");
@@ -590,6 +640,21 @@ class Generator {
out.printil("}");
out.println();
+ // Implement JspSourceImports
+ out.printil("public java.util.Set<java.lang.String>
getPackageImports() {");
+ out.pushIndent();
+ out.printil("return _jspx_imports_packages;");
+ out.popIndent();
+ out.printil("}");
+ out.println();
+ out.printil("public java.util.Set<java.lang.String> getClassImports()
{");
+ out.pushIndent();
+ out.printil("return _jspx_imports_classes;");
+ out.popIndent();
+ out.printil("}");
+ out.println();
+
+
generateInit();
generateDestroy();
}
@@ -614,7 +679,9 @@ class Generator {
out.print(servletClassName);
out.print(" extends ");
out.println(pageInfo.getExtends());
- out.printin(" implements
org.apache.jasper.runtime.JspSourceDependent");
+ out.printin(" implements
org.apache.jasper.runtime.JspSourceDependent,");
+ out.println();
+ out.printin("
org.apache.jasper.runtime.JspSourceImports");
if (!pageInfo.isThreadSafe()) {
out.println(",");
out.printin(" javax.servlet.SingleThreadModel");
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1644524&r1=1644523&r2=1644524&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Wed Dec 10 21:15:36 2014
@@ -26,10 +26,12 @@ import java.security.PrivilegedException
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Set;
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ExpressionFactory;
+import javax.el.ImportHandler;
import javax.el.ValueExpression;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
@@ -962,10 +964,24 @@ public class PageContextImpl extends Pag
@Override
public ELContext getELContext() {
- if (this.elContext == null) {
- this.elContext = this.applicationContext.createELContext(this);
+ if (elContext == null) {
+ elContext = applicationContext.createELContext(this);
+ if (servlet instanceof JspSourceImports) {
+ ImportHandler ih = elContext.getImportHandler();
+ Set<String> packageImports = ((JspSourceImports)
servlet).getPackageImports();
+ if (packageImports != null) {
+ for (String packageImport : packageImports) {
+ ih.importPackage(packageImport);
+ }
+ }
+ Set<String> classImports = ((JspSourceImports)
servlet).getClassImports();
+ if (classImports != null) {
+ for (String classImport : classImports) {
+ ih.importClass(classImport);
+ }
+ }
+ }
}
return this.elContext;
}
-
}
Modified: tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java?rev=1644524&r1=1644523&r2=1644524&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java (original)
+++ tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java Wed Dec 10
21:15:36 2014
@@ -138,11 +138,12 @@ public class TestImportHandler {
/**
* Import an invalid class.
*/
- @Test(expected=ELException.class)
+ @Test
public void testImportClass02() {
ImportHandler handler = new ImportHandler();
-
handler.importClass("org.apache.tomcat.util.res.StringManagerX");
+ Class<?> result = handler.resolveClass("StringManagerX");
+ Assert.assertNull(result);
}
Modified: tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1644524&r1=1644523&r2=1644524&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java Wed Dec 10
21:15:36 2014
@@ -16,7 +16,10 @@
*/
package org.apache.el;
-import static org.junit.Assert.assertTrue;
+import java.math.BigDecimal;
+import java.util.Collections;
+
+import javax.servlet.DispatcherType;
import org.junit.Assert;
import org.junit.Test;
@@ -402,8 +405,33 @@ public class TestELInJsp extends TomcatB
}
+ /*
+ * BZ https://issues.apache.org/bugzilla/show_bug.cgi?id=57142
+ * javax.servlet, javax.servlet.http and javax.servlet.jsp should be
+ * imported by default.
+ */
+ @Test
+ public void testBug57142() throws Exception {
+ getTomcatInstanceTestWebapp(false, true);
+
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
+ "/test/bug5nnnn/bug57142.jsp");
+
+ String result = res.toString();
+ // javax.servlet
+ assertEcho(result, "00-" + DispatcherType.ASYNC);
+ // No obvious status fields for javax.servlet.http
+ // Could hack something with HttpUtils...
+ // No obvious status fields for javax.servlet.jsp
+ // Wild card (package) import
+ assertEcho(result, "01-" + BigDecimal.ROUND_UP);
+ // Class import
+ assertEcho(result, "02-" + Collections.EMPTY_LIST.size());
+ }
+
+
// Assertion for text contained with <p></p>, e.g. printed by tags:echo
private static void assertEcho(String result, String expected) {
- assertTrue(result, result.indexOf("<p>" + expected + "</p>") > 0);
+ Assert.assertTrue(result, result.indexOf("<p>" + expected + "</p>") >
0);
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1644524&r1=1644523&r2=1644524&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Dec 10 21:15:36 2014
@@ -170,6 +170,12 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>57142</bug>: As per the clarification from the JSP specification
+ maintenance lead, classes and packages imported via the paeg directive
+ must be made available to the EL environment via the ImportHandler.
+ (markt)
+ </fix>
+ <fix>
<bug>57247</bug>: Correct the default Java source and target versions
in
the JspC usage message to <code>1.7</code> for Java 7. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
