Author: remy.maucherat(a)jboss.com
Date: 2014-01-20 11:42:59 -0500 (Mon, 20 Jan 2014)
New Revision: 2346
Modified:
branches/7.4.x/src/main/java/org/apache/jasper/compiler/PageInfo.java
branches/7.4.x/src/main/java/org/apache/jasper/compiler/Validator.java
Log:
Port Tomcat BZ56012: Imports now require a package
Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/PageInfo.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/jasper/compiler/PageInfo.java 2014-01-17
14:30:55 UTC (rev 2345)
+++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/PageInfo.java 2014-01-20
16:42:59 UTC (rev 2346)
@@ -405,17 +405,8 @@
/*
* extends
*/
- public void setExtends(String value, Node.PageDirective n) {
-
+ public void setExtends(String value) {
xtends = value;
-
- /*
- * If page superclass is top level class (i.e. not in a package)
- * explicitly import it. If this is not done, the compiler will assume
- * the extended class is in the same pkg as the generated servlet.
- */
- if (value.indexOf('.') < 0)
- n.addImport(value);
}
/**
Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/Validator.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/jasper/compiler/Validator.java 2014-01-17
14:30:55 UTC (rev 2345)
+++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/Validator.java 2014-01-20
16:42:59 UTC (rev 2346)
@@ -124,7 +124,7 @@
}
} else if ("extends".equals(attr)) {
if (pageInfo.getExtends(false) == null) {
- pageInfo.setExtends(value, n);
+ pageInfo.setExtends(value);
} else if (!pageInfo.getExtends(false).equals(value)) {
err.jspError(n.getStart(),
MESSAGES.invalidConflictingPageDirectiveAttribute
(attr, pageInfo.getExtends(false), value));