Author: tmjee
Date: Sat Jul 22 00:54:40 2006
New Revision: 424536
URL: http://svn.apache.org/viewvc?rev=424536&view=rev
Log:
- WW-1389 WW-1367
- changed to use 's' prefix instead of 'saf'
- changed uri to be '/tags' instead of '/struts-action'
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/index.jsp
Modified:
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=424536&r1=424535&r2=424536&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
Sat Jul 22 00:54:40 2006
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
-<[EMAIL PROTECTED] prefix="saf" uri="/struts-action" %>
+<[EMAIL PROTECTED] prefix="s" uri="/tags" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -11,66 +11,66 @@
</head>
<body>
<!-- 1 -->
-<saf:if test="true">
+<s:if test="true">
1]THIS SHOULD APPEAR <br/>
-</saf:if>
-<saf:else>
+</s:if>
+<s:else>
THIS SHOULD NOT APPEAR <br/>
-</saf:else>
+</s:else>
<!-- 2 -->
-<saf:if test="false">
+<s:if test="false">
THIS SHOULD NOT APPEAR <br/>
-</saf:if>
-<saf:elseif test="true">
+</s:if>
+<s:elseif test="true">
2]THIS SHOULD APPEAR <br/>
-</saf:elseif>
+</s:elseif>
<!-- 3 -->
-<saf:if test="false">
+<s:if test="false">
THIS SHOULD NOT APPEAR <br/>
-</saf:if>
-<saf:elseif test="false">
+</s:if>
+<s:elseif test="false">
THIS SHOULD NOT APPEAR <br/>
-</saf:elseif>
-<saf:elseif test="true">
+</s:elseif>
+<s:elseif test="true">
3]THIS SHOULD APPEAR <br/>
-</saf:elseif>
-<saf:elseif test="true">
+</s:elseif>
+<s:elseif test="true">
THIS SHOULD NOT APPEAR <br/>
-</saf:elseif>
-<saf:else>
+</s:elseif>
+<s:else>
THIS SHOULD NOT APPEAR <br/>
-</saf:else>
+</s:else>
<!-- 4 -->
-<saf:if test="false">
+<s:if test="false">
THIS SHOULD NOT APPEAR<br/>
-</saf:if>
-<saf:elseif test="false">
+</s:if>
+<s:elseif test="false">
THIS SHOULD NOT APPEAR<br/>
-</saf:elseif>
-<saf:else>
+</s:elseif>
+<s:else>
4]THIS SHOULD APPEAR<br/>
-</saf:else>
+</s:else>
<!-- 5 -->
-<saf:if test="false">
+<s:if test="false">
THIS SHOULD NOT APPEAR<br/>
-</saf:if>
-<saf:elseif test="false">
+</s:if>
+<s:elseif test="false">
THIS SHOULD NOT APPEAR<br/>
-</saf:elseif>
-<saf:elseif test="false">
+</s:elseif>
+<s:elseif test="false">
THIS SHOULD NOT APPEAR<br/>
-</saf:elseif>
-<saf:elseif test="false">
+</s:elseif>
+<s:elseif test="false">
THIS SHOULD NOT APPEAR<br/>
-</saf:elseif>
-<saf:else>
+</s:elseif>
+<s:else>
5]THIS SHOULD APPEAR<br/>
-</saf:else>
+</s:else>
</body>
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=424536&r1=424535&r2=424536&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:54:40 2006
@@ -15,8 +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>
+ <li><s:url id="url" action="testIfTagJsp"
namespace="/tags/non-ui/ifTag"/><s:a href="%{#url}">If Tag (JSP)</s:a></li>
+ <li><s:url id="url" action="testIfTagFreemarker"
namespace="/tags/non-ui/ifTag"/><s:a href="%{#url}">If Tag
(Freemarker)</s:a></li>
</ul>
</body>
