geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1297340 - in /geronimo/server/trunk/testsuite/aries-testsuite/jsp: jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/ jsp-taglib/src/main/resources/META-INF/ jsp-taglib/src/main/resources/META-INF/tags/ jsp-wab/src/main/resources/
Date Tue, 06 Mar 2012 05:20:04 GMT
Author: gawor
Date: Tue Mar  6 05:20:04 2012
New Revision: 1297340

URL: http://svn.apache.org/viewvc?rev=1297340&view=rev
Log:
GERONIMO-6295: test case to demonstrate the problem

Added:
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/tags/
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/tags/dateTime.tag
Modified:
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
    geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp

Modified: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java?rev=1297340&r1=1297339&r2=1297340&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
(original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-eba/src/test/java/org/apache/geronimo/testsuite/jsp/JSPTest.java
Tue Mar  6 05:20:04 2012
@@ -50,6 +50,9 @@ public class JSPTest extends TestSupport
         
         assertTrue("WAB date tag", 
                 reply.contains("Today is:"));
+
+        assertTrue("WAB dateTime tag", 
+                reply.contains("Date is:"));
     }
   
     private String doGET(URL url, int repeat, long delay) {

Modified: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld?rev=1297340&r1=1297339&r2=1297340&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
(original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/taglib.tld
Tue Mar  6 05:20:04 2012
@@ -22,9 +22,16 @@
     <jspversion>2.1</jspversion>
     <shortname>dateTagLib</shortname>
     <uri>http://geronimo.apache.org/jsf/date</uri>
+
+    <tag-file>
+        <name>dateTime</name>
+        <path>/META-INF/tags/dateTime.tag</path>
+    </tag-file>
+
     <tag>
        <name>date</name>
        <tagclass>org.apache.geronimo.test.jsp.taglib.DateTag</tagclass>
        <bodycontent>empty</bodycontent>
     </tag>
+
 </taglib>

Added: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/tags/dateTime.tag
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/tags/dateTime.tag?rev=1297340&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/tags/dateTime.tag
(added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-taglib/src/main/resources/META-INF/tags/dateTime.tag
Tue Mar  6 05:20:04 2012
@@ -0,0 +1,6 @@
+<%@ tag description="Date Time Tag" pageEncoding="UTF-8" %>
+<%@ tag import="java.util.Date" %>
+<% 
+  Date now = new Date();
+  out.println("Date is: " + now);
+%>

Modified: geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp?rev=1297340&r1=1297339&r2=1297340&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
(original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jsp/jsp-wab/src/main/resources/hello.jsp
Tue Mar  6 05:20:04 2012
@@ -25,5 +25,7 @@
     <heading:heading />
     <br/>
     <date:date />
+    <br/>
+    <date:dateTime />
 </body>
 </html>



Mime
View raw message