Author: markt
Date: Wed Jul 17 18:49:31 2013
New Revision: 1504232
URL: http://svn.apache.org/r1504232
Log:
The specification does not appear to allow the use of imports in a JSP page.
EL 3.0 section 1.5.1 states that the ELResolvers process identifiers before the
ImportHandler
JSP 2.3 section JSP.2.9 defines a set of ELResolvers that will always produce a
result hence the resolution of identifiers never progress to imports.
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/webapp/el-misc.jsp
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1504232&r1=1504231&r2=1504232&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Wed Jul 17 18:49:31 2013
@@ -370,6 +370,7 @@ public class TestELInJsp extends TomcatB
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-misc.jsp");
String result = res.toString();
+
assertEcho(result, "00-\\\\\\\"${'hello world'}");
assertEcho(result, "01-\\\\\\\"\\${'hello world'}");
assertEcho(result, "02-\\\"${'hello world'}");
@@ -390,8 +391,6 @@ public class TestELInJsp extends TomcatB
assertEcho(result, "17-foo\\bar\\baz");
assertEcho(result, "18-3");
assertEcho(result, "19-4");
- // TODO Figure out why this doesn't work.
- // assertEcho(result, "20-" + Integer.MAX_VALUE);
}
@Test
Modified: tomcat/trunk/test/webapp/el-misc.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/el-misc.jsp?rev=1504232&r1=1504231&r2=1504232&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/el-misc.jsp (original)
+++ tomcat/trunk/test/webapp/el-misc.jsp Wed Jul 17 18:49:31 2013
@@ -38,6 +38,5 @@
<tags:echo echo='17-${"foo"}\\${'bar'}\\${"baz"}' />
<tags:echo echo='18-${((x,y)->x+y)(1,2)}' />
<tags:echo echo='19-${{1,2,3,4}.stream().max().orElse(-1)}' />
- <tags:echo echo='20-${Integer.MAX_VAUE}' />
</body>
</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
