You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/01 21:06:38 UTC
svn commit: r1772274 - in /tomcat/tc7.0.x/trunk/test/webapp-3.0:
WEB-INF/test.tld bug6nnnn/bug60431.jsp
Author: markt
Date: Thu Dec 1 21:06:38 2016
New Revision: 1772274
URL: http://svn.apache.org/viewvc?rev=1772274&view=rev
Log:
Fix broken test
- += is not valid UEL syntx in 2.2
- functions need to be defined in TLD
Modified:
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug6nnnn/bug60431.jsp
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld?rev=1772274&r1=1772273&r2=1772274&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld Thu Dec 1 21:06:38 2016
@@ -31,4 +31,21 @@
java.lang.String trim(java.lang.String)
</function-signature>
</function>
+
+ <function>
+ <name>concat</name>
+ <function-class>org.apache.el.TesterFunctions</function-class>
+ <function-signature>
+ java.lang.String concat(java.lang.String[])
+ </function-signature>
+ </function>
+
+ <function>
+ <name>toArray</name>
+ <function-class>org.apache.el.TesterFunctions</function-class>
+ <function-signature>
+ java.lang.String toArray(java.lang.String,java.lang.String)
+ </function-signature>
+ </function>
+
</taglib>
\ No newline at end of file
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug6nnnn/bug60431.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug6nnnn/bug60431.jsp?rev=1772274&r1=1772273&r2=1772274&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug6nnnn/bug60431.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug6nnnn/bug60431.jsp Thu Dec 1 21:06:38 2016
@@ -19,7 +19,7 @@
<html>
<head><title>Bug 60431 test case</title></head>
<body>
- <tags:echo echo="${'01-' += fn:concat('O', 'K')}"/>
- <tags:echo echo="${'02-' += fn:concat(fn:toArray('O', 'K'))}"/>
+ <tags:echo echo="${'01-'}${fn:concat('O', 'K')}"/>
+ <tags:echo echo="${'02-'}${fn:concat(fn:toArray('O', 'K'))}"/>
</body>
</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org