You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by tm...@apache.org on 2006/07/22 09:25:16 UTC
svn commit: r424533 - in /struts/struts2/trunk/apps/showcase/src/main: resources/struts-tags-non-ui.xml webapp/tags/non-ui/ifTag/ webapp/tags/non-ui/ifTag/testIf.ftl webapp/tags/non-ui/ifTag/testIf.jsp webapp/tags/non-ui/index.jsp

Author: tmjee
Date: Sat Jul 22 00:25:15 2006
New Revision: 424533

URL: http://svn.apache.org/viewvc?rev=424533&view=rev
Log:
WW-1389
  - added test example into showcase to using If/Else/ElseIf tag (in JSP
    and freemarker form)


Added:
    struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/
    struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
    struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp   (with props)
Modified:
    struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
    struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp

Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml?rev=424533&r1=424532&r2=424533&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml Sat Jul 22 00:25:15 2006
@@ -110,6 +110,16 @@
 		</action>
 	</package>
 	
-	
+	<!--  ========================================== -->
+	<!--  === Package for If Tag Test / Examples === -->
+	<!--  ========================================== -->
+	<package name="ifTagPackage" extends="struts-default" namespace="/tags/non-ui/ifTag">
+		<action name="testIfTagJsp">
+			<result>/tags/non-ui/ifTag/testIf.jsp</result>
+		</action>
+		<action name="testIfTagFreemarker">
+			<result type="freemarker">/tags/non-ui/ifTag/testIf.ftl</result>
+		</action>
+	</package>
 </struts>
 

Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl?rev=424533&view=auto
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl (added)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl Sat Jul 22 00:25:15 2006
@@ -0,0 +1,68 @@
+<html>
+	<head>
+		<title>TEST IF</title>
+	</head>
+	<body>
+<!--  1 -->
+<@saf.if test="true">
+	1]THIS SHOULD APPEAR <br/>
+</...@saf.if>
+<@saf.else>
+	THIS SHOULD NOT APPEAR <br/>
+</...@saf.else>
+
+
+<!--  2 -->
+<@saf.if test="false">
+	THIS SHOULD NOT APPEAR <br/>
+</...@saf.if>
+<@saf.elseif test="true">
+	2]THIS SHOULD APPEAR <br/>
+</...@saf.elseif>
+
+<!--  3 -->
+<@saf.if test="false">
+	THIS SHOULD NOT APPEAR <br/>
+</...@saf.if>
+<@saf.elseif test="false">
+	THIS SHOULD NOT APPEAR <br/>
+</...@saf.elseif>
+<@saf.elseif test="true">
+	3]THIS SHOULD APPEAR <br/>
+</...@saf.elseif>
+<@saf.elseif test="true">
+	THIS SHOULD NOT APPEAR <br/>
+</...@saf.elseif>
+<@saf.else>
+	THIS SHOULD NOT APPEAR <br/>
+</...@saf.else>
+
+<!-- 4 -->
+<@saf.if test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</...@saf.if>
+<@saf.elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</...@saf.elseif>
+<@saf.else>
+	4]THIS SHOULD APPEAR<br/>
+</...@saf.else>
+
+<!-- 5 -->
+<@saf.if test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</...@saf.if>
+<@saf.elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</...@saf.elseif>
+<@saf.elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</...@saf.elseif>
+<@saf.elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</...@saf.elseif>
+<@saf.else>
+	5]THIS SHOULD APPEAR<br/>
+</...@saf.else>
+	</body>
+</html>

Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp?rev=424533&view=auto
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp (added)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp Sat Jul 22 00:25:15 2006
@@ -0,0 +1,77 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+
+<%@taglib prefix="saf" uri="/struts-action" %>    
+    
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+<!--  1 -->
+<saf:if test="true">
+	1]THIS SHOULD APPEAR <br/>
+</saf:if>
+<saf:else>
+	THIS SHOULD NOT APPEAR <br/>
+</saf:else>
+
+
+<!--  2 -->
+<saf:if test="false">
+	THIS SHOULD NOT APPEAR <br/>
+</saf:if>
+<saf:elseif test="true">
+	2]THIS SHOULD APPEAR <br/>
+</saf:elseif>
+
+<!--  3 -->
+<saf:if test="false">
+	THIS SHOULD NOT APPEAR <br/>
+</saf:if>
+<saf:elseif test="false">
+	THIS SHOULD NOT APPEAR <br/>
+</saf:elseif>
+<saf:elseif test="true">
+	3]THIS SHOULD APPEAR <br/>
+</saf:elseif>
+<saf:elseif test="true">
+	THIS SHOULD NOT APPEAR <br/>
+</saf:elseif>
+<saf:else>
+	THIS SHOULD NOT APPEAR <br/>
+</saf:else>
+
+<!-- 4 -->
+<saf:if test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</saf:if>
+<saf:elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</saf:elseif>
+<saf:else>
+	4]THIS SHOULD APPEAR<br/>
+</saf:else>
+
+<!-- 5 -->
+<saf:if test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</saf:if>
+<saf:elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</saf:elseif>
+<saf:elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</saf:elseif>
+<saf:elseif test="false">
+	THIS SHOULD NOT APPEAR<br/>
+</saf:elseif>
+<saf:else>
+	5]THIS SHOULD APPEAR<br/>
+</saf:else>
+
+
+</body>
+</html>
\ No newline at end of file

Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp?rev=424533&r1=424532&r2=424533&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp Sat Jul 22 00:25:15 2006
@@ -15,6 +15,8 @@
     <li><s:url id="url" action="showMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" /><s:a href="%{#url}">Merge Iterator Demo</s:a>
     <li><s:url id="url" action="showSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" /><s:a href="%{#url}">Subset Tag</s:a>
     <li><s:url id="url" value="actionPrefix/index.jsp"/><s:a href="%{#url}">Action Prefix Example</s:a></li>
+	<li><saf:url id="url" action="testIfTagJsp" namespace="/tags/non-ui/ifTag"/><saf:a href="%{#url}">If Tag (JSP)</saf:a></li>
+	<li><saf:url id="url" action="testIfTagFreemarker" namespace="/tags/non-ui/ifTag"/><saf:a href="%{#url}">If Tag (Freemarker)</saf:a></li>
 </ul>
 
 </body>