You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/07/21 03:04:47 UTC
svn commit: r424152 [3/4] - in /struts/struts2/trunk: ./ ant-build/ apps/
apps/blank/src/main/webapp/WEB-INF/ apps/blank/src/main/webapp/WEB-INF/pages/
apps/mailreader/src/main/webapp/pages/
apps/portlet/src/main/webapp/WEB-INF/edit/ apps/portlet/src/m...
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp Thu Jul 20 18:04:41 2006
@@ -1,12 +1,12 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>UI Tags Example: Date</title>
- <saf:head/>
+ <s:head/>
</head>
<body>
-<saf:action id="myDate" name="date" namespace="/" executeResult="false" />
+<s:action id="myDate" name="date" namespace="/" executeResult="false" />
<table>
<tr>
@@ -17,87 +17,87 @@
<tr>
<td><strong>Before date</strong></td>
<td>toString()</td>
- <td><saf:property value="#myDate.before.toString()"/></td>
+ <td><s:property value="#myDate.before.toString()"/></td>
</tr>
<tr>
<td><strong>Past date</strong></td>
<td>toString()</td>
- <td><saf:property value="#myDate.past.toString()"/></td>
+ <td><s:property value="#myDate.past.toString()"/></td>
</tr>
<tr>
<td><strong>Now date</strong></td>
<td>toString()</td>
- <td><saf:property value="#myDate.now.toString()"/></td>
+ <td><s:property value="#myDate.now.toString()"/></td>
</tr>
<tr>
<td><strong>Future date</strong></td>
<td>toString()</td>
- <td><saf:property value="#myDate.future.toString()"/></td>
+ <td><s:property value="#myDate.future.toString()"/></td>
</tr>
<tr>
<td><strong>After date</strong></td>
<td>toString()</td>
- <td><saf:property value="#myDate.after.toString()"/></td>
+ <td><s:property value="#myDate.after.toString()"/></td>
</tr>
<tr>
<td><strong>Current date</strong></td>
<td>yyyy/MM/dd hh:mm:ss</td>
- <td><saf:date name="#myDate.now" format="yyyy/MM/dd hh:mm:ss" /></td>
+ <td><s:date name="#myDate.now" format="yyyy/MM/dd hh:mm:ss" /></td>
</tr>
<tr>
<td><strong>Current date</strong></td>
<td>dd.MM.yyyy hh:mm:ss</td>
- <td><saf:date name="#myDate.now" format="dd.MM.yyyy hh:mm:ss" /></td>
+ <td><s:date name="#myDate.now" format="dd.MM.yyyy hh:mm:ss" /></td>
</tr>
<tr>
<td><strong>Current time (24h)</strong></td>
<td>HH:mm:ss</td>
- <td><saf:date name="#myDate.now" format="HH:mm:ss" /></td>
+ <td><s:date name="#myDate.now" format="HH:mm:ss" /></td>
</tr>
<tr>
<td><strong>Before date</strong></td>
<td>MMM, dd yyyy</td>
- <td><saf:date name="#myDate.before" format="MMM, dd yyyy" /></td>
+ <td><s:date name="#myDate.before" format="MMM, dd yyyy" /></td>
</tr>
<tr>
<td><strong>Before date</strong></td>
<td>nice</td>
- <td><saf:date name="#myDate.before" nice="true"/></td>
+ <td><s:date name="#myDate.before" nice="true"/></td>
</tr>
<tr>
<td><strong>After date</strong></td>
<td>dd.MM.yyyy</td>
- <td><saf:date name="#myDate.after" format="dd.MM.yyyy" /></td>
+ <td><s:date name="#myDate.after" format="dd.MM.yyyy" /></td>
</tr>
<tr>
<td><strong>After date</strong></td>
<td>nice</td>
- <td><saf:date name="#myDate.after" nice="true"/></td>
+ <td><s:date name="#myDate.after" nice="true"/></td>
</tr>
<tr>
<td><strong>Past date</strong></td>
<td>dd/MM/yyyy hh:mm</td>
- <td><saf:date name="#myDate.past" format="dd/MM/yyyy hh:mm"/></td>
+ <td><s:date name="#myDate.past" format="dd/MM/yyyy hh:mm"/></td>
</tr>
<tr>
<td><strong>Future date</strong></td>
<td>MM-dd-yy</td>
- <td><saf:date name="#myDate.past" format="MM-dd-yy"/></td>
+ <td><s:date name="#myDate.past" format="MM-dd-yy"/></td>
</tr>
<tr>
<td><strong>Future date (fallback)</strong></td>
<td>fallback</td>
- <td><saf:date name="#myDate.future" /></td>
+ <td><s:date name="#myDate.future" /></td>
</tr>
<tr>
<td><strong>Past date</strong></td>
<td>nice</td>
- <td><saf:date name="#myDate.past" nice="true"/></td>
+ <td><s:date name="#myDate.past" nice="true"/></td>
</tr>
<tr>
<td><strong>Future date</strong></td>
<td>nice</td>
- <td><saf:date name="#myDate.future" nice="true"/></td>
+ <td><s:date name="#myDate.future" nice="true"/></td>
</tr>
</table>
</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=424152&r1=424151&r2=424152&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 Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -8,13 +8,13 @@
<h1>Non UI Tags</h1>
<ul>
- <li><saf:url id="url" action="showActionTagDemo" namespace="/tags/non-ui/actionTag"/><saf:a href="%{url}">Action Tag</saf:a></li>
- <li><saf:url id="url" value="date.jsp" /><saf:a href="%{url}">Date Tag</saf:a></li>
- <li><saf:url id="url" action="showGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" /><saf:a href="%{url}">Iterator Generator Tag</saf:a></li>
- <li><saf:url id="url" action="showAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" /><saf:a href="%{#url}">Append Iterator Tag</saf:a>
- <li><saf:url id="url" action="showMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" /><saf:a href="%{#url}">Merge Iterator Demo</saf:a>
- <li><saf:url id="url" action="showSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" /><saf:a href="%{#url}">Subset Tag</saf:a>
- <li><saf:url id="url" value="actionPrefix/index.jsp"/><saf:a href="%{#url}">Action Prefix Example</saf:a></li>
+ <li><s:url id="url" action="showActionTagDemo" namespace="/tags/non-ui/actionTag"/><s:a href="%{url}">Action Tag</s:a></li>
+ <li><s:url id="url" value="date.jsp" /><s:a href="%{url}">Date Tag</s:a></li>
+ <li><s:url id="url" action="showGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" /><s:a href="%{url}">Iterator Generator Tag</s:a></li>
+ <li><s:url id="url" action="showAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" /><s:a href="%{#url}">Append Iterator Tag</s:a>
+ <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>
</ul>
</body>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,20 +6,20 @@
</head>
<body>
- <saf:generator id="iterator1" separator="," val="%{iteratorValue1}" />
- <saf:generator id="iterator2" separator="," val="%{iteratorValue2}" />
-
- <saf:append id="appendedIterator">
- <saf:param value="%{#attr.iterator1}" />
- <saf:param value="%{#attr.iterator2}" />
- </saf:append>
-
- <saf:iterator value="#appendedIterator">
- <saf:property /><br/>
- </saf:iterator>
-
- <saf:url value="%{'/tags/non-ui/'}" id="url" /><saf:a href="%{#url}">Back To Non-UI Demo</saf:a>
- <saf:url value="%{'/'}" id="url" /><saf:a href="%{#url}">Back To Showcase</saf:a>
+ <s:generator id="iterator1" separator="," val="%{iteratorValue1}" />
+ <s:generator id="iterator2" separator="," val="%{iteratorValue2}" />
+
+ <s:append id="appendedIterator">
+ <s:param value="%{#attr.iterator1}" />
+ <s:param value="%{#attr.iterator2}" />
+ </s:append>
+
+ <s:iterator value="#appendedIterator">
+ <s:property /><br/>
+ </s:iterator>
+
+ <s:url value="%{'/tags/non-ui/'}" id="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
+ <s:url value="%{'/'}" id="url" /><s:a href="%{#url}">Back To Showcase</s:a>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,14 +6,14 @@
</head>
<body>
- <saf:generator val="%{value}" separator="%{separator}" count="%{count}">
- <saf:iterator value="%{top}">
- <saf:property /><br/>
- </saf:iterator>
- </saf:generator>
+ <s:generator val="%{value}" separator="%{separator}" count="%{count}">
+ <s:iterator value="%{top}">
+ <s:property /><br/>
+ </s:iterator>
+ </s:generator>
- <saf:url value="%{'/tags/non-ui/'}" id="url" /><saf:a href="%{#url}">Back To Non-UI Demo</saf:a>
- <saf:url value="%{'/'}" id="url" /><saf:a href="%{#url}">Back To Showcase</saf:a>
+ <s:url value="%{'/tags/non-ui/'}" id="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
+ <s:url value="%{'/'}" id="url" /><s:a href="%{#url}">Back To Showcase</s:a>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,20 +6,20 @@
</head>
<body>
- <saf:generator id="iterator1" val="%{iteratorValue1}" separator="," />
- <saf:generator id="iterator2" val="%{iteratorValue2}" separator="," />
-
- <saf:merge id="mergedIterator">
- <saf:param value="%{#attr.iterator1}" />
- <saf:param value="%{#attr.iterator2}" />
- </saf:merge>
-
- <saf:iterator value="%{#mergedIterator}">
- <saf:property /><br/>
- </saf:iterator>
+ <s:generator id="iterator1" val="%{iteratorValue1}" separator="," />
+ <s:generator id="iterator2" val="%{iteratorValue2}" separator="," />
+
+ <s:merge id="mergedIterator">
+ <s:param value="%{#attr.iterator1}" />
+ <s:param value="%{#attr.iterator2}" />
+ </s:merge>
+
+ <s:iterator value="%{#mergedIterator}">
+ <s:property /><br/>
+ </s:iterator>
- <saf:url value="%{'/tags/non-ui/'}" id="url" /><saf:a href="%{#url}">Back To Non-UI Demo</saf:a>
- <saf:url value="%{'/'}" id="url" /><saf:a href="%{#url}">Back To Showcase</saf:a>
+ <s:url value="%{'/tags/non-ui/'}" id="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
+ <s:url value="%{'/'}" id="url" /><s:a href="%{#url}">Back To Showcase</s:a>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,14 +6,14 @@
</head>
<body>
- <saf:actionerror/>
- <saf:actionmessage/>
+ <s:actionerror/>
+ <s:actionmessage/>
- <saf:form action="submitAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" method="POST">
- <saf:textfield label="iterator 1 values (comma separated)" name="iteratorValue1" />
- <saf:textfield label="iterator 2 values (comma separated)" name="iteratorValue2" />
- <saf:submit />
- </saf:form>
+ <s:form action="submitAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" method="POST">
+ <s:textfield label="iterator 1 values (comma separated)" name="iteratorValue1" />
+ <s:textfield label="iterator 2 values (comma separated)" name="iteratorValue2" />
+ <s:submit />
+ </s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp Thu Jul 20 18:04:41 2006
@@ -1,21 +1,21 @@
-<%@taglib uri="/struts-action" prefix="saf" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Showcase - Tag - Non Ui Tag - Iterator Generator Tag Demo</title>
-<saf:head/>
+<s:head/>
</head>
<body>
- <saf:actionerror/>
- <saf:actionmessage/>
-
- <saf:form action="submitGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" method="POST">
- <saf:textfield label="Value" name="value" />
- <saf:textfield label="Separator" name="separator" />
- <saf:textfield label="Count" name="count" />
- <saf:submit />
- </saf:form>
+ <s:actionerror/>
+ <s:actionmessage/>
+
+ <s:form action="submitGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" method="POST">
+ <s:textfield label="Value" name="value" />
+ <s:textfield label="Separator" name="separator" />
+ <s:textfield label="Count" name="count" />
+ <s:submit />
+ </s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib uri="/struts-action" prefix="saf" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,11 +6,11 @@
</head>
<body>
- <saf:form action="submitMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" method="POST">
- <saf:textfield label="Iterator 1 Value (Comma Separated)" name="iteratorValue1" />
- <saf:textfield label="Iterator 2 Value (Comma Separated)" name="iteratorValue2" />
- <saf:submit />
- </saf:form>
+ <s:form action="submitMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" method="POST">
+ <s:textfield label="Iterator 1 Value (Comma Separated)" name="iteratorValue1" />
+ <s:textfield label="Iterator 2 Value (Comma Separated)" name="iteratorValue2" />
+ <s:submit />
+ </s:form>
</body>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib uri="/struts-action" prefix="saf" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,15 +6,15 @@
</head>
<body>
- <saf:actionerror/>
- <saf:actionmessage/>
+ <s:actionerror/>
+ <s:actionmessage/>
- <saf:form action="submitSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" method="POST">
- <saf:textfield label="Iterator value (comma separated)" name="iteratorValue" />
- <saf:textfield label="Count" name="count" />
- <saf:textfield label="Start" name="start" />
- <saf:submit />
- </saf:form>
+ <s:form action="submitSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" method="POST">
+ <s:textfield label="Iterator value (comma separated)" name="iteratorValue" />
+ <s:textfield label="Count" name="count" />
+ <s:textfield label="Start" name="start" />
+ <s:submit />
+ </s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -6,16 +6,16 @@
</head>
<body>
- <saf:generator id="iterator" val="%{iteratorValue}" separator="," />
+ <s:generator id="iterator" val="%{iteratorValue}" separator="," />
- <saf:subset count="%{count}" start="%{start}" source="%{#attr.iterator}" >
- <saf:iterator>
- <saf:property /><br/>
- </saf:iterator>
- </saf:subset>
+ <s:subset count="%{count}" start="%{start}" source="%{#attr.iterator}" >
+ <s:iterator>
+ <s:property /><br/>
+ </s:iterator>
+ </s:subset>
- <saf:url value="%{'/tags/non-ui/'}" id="url" /><saf:a href="%{#url}">Back To Non-UI Demo</saf:a>
- <saf:url value="%{'/'}" id="url" /><saf:a href="%{#url}">Back To Showcase</saf:a>
+ <s:url value="%{'/tags/non-ui/'}" id="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
+ <s:url value="%{'/'}" id="url" /><s:a href="%{#url}">Back To Showcase</s:a>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp Thu Jul 20 18:04:41 2006
@@ -1,60 +1,60 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Showcase - Tags - UI Tags - Component Tag</title>
</head>
<body>
-
-This example tries to demonstrates the usage of <saf:component ... > tag.
+
+This example tries to demonstrates the usage of <s:component ... > tag.
<p/>
To have a look at the source of this jsp page click
-<saf:url id="url" action="showComponentTagExampleCode" namespace="/tags/ui"/>
-<saf:a href="%{#url}">here</saf:a>
+<s:url id="url" action="showComponentTagExampleCode" namespace="/tags/ui"/>
+<s:a href="%{#url}">here</s:a>
<p/>
-
-<b>Example 1:</b>
+
+<b>Example 1:</b>
This example load the template from the webapp context path using
the default (ftl) as its template.
- <saf:component
- theme="customTheme"
- templateDir="customTemplateDir"
- template="ftlCustomTemplate">
- <saf:param name="paramName" value="%{'paramValue1'}" />
- </saf:component>
+ <s:component
+ theme="customTheme"
+ templateDir="customTemplateDir"
+ template="ftlCustomTemplate">
+ <s:param name="paramName" value="%{'paramValue1'}" />
+ </s:component>
<p/>
-
+
<b>Example 2:</b>
This example load the template from the webapp context path using
-jsp as its template (notice the *.jsp extension to the template).
- <saf:component
- theme="customTheme"
- templateDir="customTemplateDir"
- template="jspCustomTemplate.jsp">
- <saf:param name="paramName" value="%{'paramValue2'}" />
- </saf:component>
+jsp as its template (notice the *.jsp extension to the template).
+ <s:component
+ theme="customTheme"
+ templateDir="customTemplateDir"
+ template="jspCustomTemplate.jsp">
+ <s:param name="paramName" value="%{'paramValue2'}" />
+ </s:component>
<p/>
-
+
<b>Example 3</b>
This example load the template from the webapp context path,
using the default template directory and theme (default to
'template' and 'xhtml' respectively)
- <saf:component template="mytemplate.jsp">
- <saf:param name="paramName" value="%{'paramValue3'}" />
- </saf:component>
+ <s:component template="mytemplate.jsp">
+ <s:param name="paramName" value="%{'paramValue3'}" />
+ </s:component>
<p/>
-
-
-<b>Example 4</b>
+
+
+<b>Example 4</b>
This example load the template from the webapp classpath using
a custom themplate directory and theme.
- <saf:component
- theme="myTheme"
- templateDir="myTemplateDir"
- template="myAnotherTemplate">
- <saf:param name="paramName" value="%{'paramValue4'}" />
- </saf:component>
+ <s:component
+ theme="myTheme"
+ templateDir="myTemplateDir"
+ template="myAnotherTemplate">
+ <s:param name="paramName" value="%{'paramValue4'}" />
+ </s:component>
<p/>
</body>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp Thu Jul 20 18:04:41 2006
@@ -1,6 +1,6 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
-Id:<saf:property value="%{nodeId}" /><br/>
-Name:<saf:property value="%{nodeName}" /><br/>
+Id:<s:property value="%{nodeId}" /><br/>
+Name:<s:property value="%{nodeName}" /><br/>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Thu Jul 20 18:04:41 2006
@@ -1,126 +1,126 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>UI Tags Example</title>
- <saf:head/>
+ <s:head/>
</head>
<body>
-<saf:actionerror/>
-<saf:actionmessage/>
-<saf:fielderror />
-
-
-<saf:form action="exampleSubmit" method="post" enctype="multipart/form-data" tooltipConfig="#{'jsTooltipEnabled':'true'}">
- <saf:textfield
- label="Name"
- name="name"
- tooltip="Enter your Name here" />
-
- <saf:datepicker
- tooltip="Select Your Birthday"
- label="Birthday"
- name="birthday" />
-
- <saf:textarea
- tooltip="Enter your Biography"
- label="Biograph"
- name="bio"
- cols="20"
- rows="3"/>
-
- <saf:select
- tooltip="Choose Your Favourite Color"
- label="Favorite Color"
- list="{'Red', 'Blue', 'Green'}"
- name="favoriteColor"
+<s:actionerror/>
+<s:actionmessage/>
+<s:fielderror />
+
+
+<s:form action="exampleSubmit" method="post" enctype="multipart/form-data" tooltipConfig="#{'jsTooltipEnabled':'true'}">
+ <s:textfield
+ label="Name"
+ name="name"
+ tooltip="Enter your Name here" />
+
+ <s:datepicker
+ tooltip="Select Your Birthday"
+ label="Birthday"
+ name="birthday" />
+
+ <s:textarea
+ tooltip="Enter your Biography"
+ label="Biograph"
+ name="bio"
+ cols="20"
+ rows="3"/>
+
+ <s:select
+ tooltip="Choose Your Favourite Color"
+ label="Favorite Color"
+ list="{'Red', 'Blue', 'Green'}"
+ name="favoriteColor"
emptyOption="true"
headerKey="None"
headerValue="None"/>
- <saf:select
- tooltip="Choose Your Favourite Language"
- label="Favourite Language"
- list="favouriteLanguages"
- name="favouriteLanguage"
- listKey="key"
- listValue="description"
- emptyOption="true"
- headerKey="None"
- headerValue="None"/>
-
- <saf:checkboxlist
- tooltip="Choose your Friends"
- label="Friends"
- list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
- name="friends"/>
-
- <saf:checkbox
- tooltip="Confirmed that your are Over 18"
- label="Age 18+"
- name="legalAge"/>
-
- <saf:doubleselect
- tooltip="Choose Your State"
- label="State"
- name="region" list="{'North', 'South'}"
- value="'South'"
- doubleValue="'Florida'"
+ <s:select
+ tooltip="Choose Your Favourite Language"
+ label="Favourite Language"
+ list="favouriteLanguages"
+ name="favouriteLanguage"
+ listKey="key"
+ listValue="description"
+ emptyOption="true"
+ headerKey="None"
+ headerValue="None"/>
+
+ <s:checkboxlist
+ tooltip="Choose your Friends"
+ label="Friends"
+ list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+ name="friends"/>
+
+ <s:checkbox
+ tooltip="Confirmed that your are Over 18"
+ label="Age 18+"
+ name="legalAge"/>
+
+ <s:doubleselect
+ tooltip="Choose Your State"
+ label="State"
+ name="region" list="{'North', 'South'}"
+ value="'South'"
+ doubleValue="'Florida'"
doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
doubleName="state"
headerKey="-1"
headerValue="---------- Please Select ----------"
emptyOption="true" />
- <saf:doubleselect
- tooltip="Choose your Vehical"
- label="Favourite Vehical"
- name="favouriteVehicalType"
- list="vehicalTypeList"
- listKey="key"
- listValue="description"
- value="'MotorcycleKey'"
- doubleValue="'YamahaKey'"
- doubleList="vehicalSpecificList"
- doubleListKey="key"
- doubleListValue="description"
- doubleName="favouriteVehicalSpecific" headerKey="-1"
- headerValue="---------- Please Select ----------"
- emptyOption="true" />
-
- <saf:file
- tooltip="Upload Your Picture"
- label="Picture"
- name="picture" />
-
- <saf:optiontransferselect
- tooltip="Select Your Favourite Cartoon Characters"
- label="Favourite Cartoons Characters"
- name="leftSideCartoonCharacters"
- leftTitle="Left Title"
- rightTitle="Right Title"
- list="{'Popeye', 'He-Man', 'Spiderman'}"
- multiple="true"
- headerKey="headerKey"
- headerValue="--- Please Select ---"
- emptyOption="true"
- doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
- doubleName="rightSideCartoonCharacters"
- doubleHeaderKey="doubleHeaderKey"
- doubleHeaderValue="--- Please Select ---"
- doubleEmptyOption="true"
- doubleMultiple="true" />
+ <s:doubleselect
+ tooltip="Choose your Vehical"
+ label="Favourite Vehical"
+ name="favouriteVehicalType"
+ list="vehicalTypeList"
+ listKey="key"
+ listValue="description"
+ value="'MotorcycleKey'"
+ doubleValue="'YamahaKey'"
+ doubleList="vehicalSpecificList"
+ doubleListKey="key"
+ doubleListValue="description"
+ doubleName="favouriteVehicalSpecific" headerKey="-1"
+ headerValue="---------- Please Select ----------"
+ emptyOption="true" />
+
+ <s:file
+ tooltip="Upload Your Picture"
+ label="Picture"
+ name="picture" />
+
+ <s:optiontransferselect
+ tooltip="Select Your Favourite Cartoon Characters"
+ label="Favourite Cartoons Characters"
+ name="leftSideCartoonCharacters"
+ leftTitle="Left Title"
+ rightTitle="Right Title"
+ list="{'Popeye', 'He-Man', 'Spiderman'}"
+ multiple="true"
+ headerKey="headerKey"
+ headerValue="--- Please Select ---"
+ emptyOption="true"
+ doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+ doubleName="rightSideCartoonCharacters"
+ doubleHeaderKey="doubleHeaderKey"
+ doubleHeaderValue="--- Please Select ---"
+ doubleEmptyOption="true"
+ doubleMultiple="true" />
- <saf:textarea
- label="Your Thougths"
- name="thoughts"
- tooltip="Enter your thoughts here" />
-
- <saf:submit onclick="alert('aaaa');" />
- <saf:reset onclick="alert('bbbb');" />
-</saf:form>
+ <s:textarea
+ label="Your Thougths"
+ name="thoughts"
+ tooltip="Enter your thoughts here" />
+
+ <s:submit onclick="alert('aaaa');" />
+ <s:reset onclick="alert('bbbb');" />
+</s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -8,36 +8,36 @@
<h1>Example Submitted</h1>
<table>
- <saf:label label="Name" name="name" />
- <saf:label label="Birthday" name="birthday" />
- <saf:label label="Biography" name="bio" />
- <saf:label label="Favourite Color" name="favouriteColor" />
- <saf:label label="Friends" name="friends" />
- <saf:label label="Legal Age" name="legalAge" />
- <saf:label label="Region" name="region" />
- <saf:label label="State" name="state" />
- <saf:label label="Picture" name="picture" />
- <saf:label label="Favourite Language" name="favouriteLanguage" />
- <saf:label label="Favourite Vehical Type" name="favouriteVehicalType" />
- <saf:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
- <tr>
- <td><label class="label">Favourite Cartoon Characters (Left):</label></td>
- <td>
- <saf:iterator value="leftSideCartoonCharacters" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property value="top" />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td><label class="label">Favourite Cartoon Characters (Right):</label></td>
- <td>
- <saf:iterator value="rightSideCartoonCharacters" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property value="top" />
- </saf:iterator>
- </td>
- </tr>
- <saf:label label="Thoughts" name="thoughts" />
-
+ <s:label label="Name" name="name" />
+ <s:label label="Birthday" name="birthday" />
+ <s:label label="Biography" name="bio" />
+ <s:label label="Favourite Color" name="favouriteColor" />
+ <s:label label="Friends" name="friends" />
+ <s:label label="Legal Age" name="legalAge" />
+ <s:label label="Region" name="region" />
+ <s:label label="State" name="state" />
+ <s:label label="Picture" name="picture" />
+ <s:label label="Favourite Language" name="favouriteLanguage" />
+ <s:label label="Favourite Vehical Type" name="favouriteVehicalType" />
+ <s:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
+ <tr>
+ <td><label class="label">Favourite Cartoon Characters (Left):</label></td>
+ <td>
+ <s:iterator value="leftSideCartoonCharacters" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property value="top" />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td><label class="label">Favourite Cartoon Characters (Right):</label></td>
+ <td>
+ <s:iterator value="rightSideCartoonCharacters" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property value="top" />
+ </s:iterator>
+ </td>
+ </tr>
+ <s:label label="Thoughts" name="thoughts" />
+
</table>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp Thu Jul 20 18:04:41 2006
@@ -1,21 +1,21 @@
-<%@taglib uri="/struts-action" prefix="saf" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
- <title>Showcase - Tags - UI Tags</title>
+ <title>Showcase - Tags - UI Tags</title>
</head>
<body>
- <h1>UI Tags</h1>
-
- <ul>
- <li><saf:url id="url" namespace="/tags/ui" action="example" method="input" /><saf:a href="%{url}">UI Example</saf:a></li>
- <li><saf:url id="url" namespace="/tags/ui" action="exampleVelocity" method="input" /><saf:a href="%{url}">UI Example (Velocity)</saf:a></li>
- <li><saf:url id="url" namespace="/tags/ui" action="lotsOfOptiontransferselect" method="input" /><saf:a href="%{url}">Option Transfer Select UI Example</saf:a></li>
- <li><saf:url id="url" namespace="/tags/ui" action="lotsOfRichtexteditor" method="input" /><saf:a href="%{url}">Rich Text Editor UI Example</saf:a></li>
- <li><saf:url id="url" namespace="/tags/ui" value="treeExampleStatic.jsp" /><saf:a href="%{url}">Tree Example (static)</saf:a>
- <li><saf:url id="url" namespace="/tags/ui" action="showDynamicTreeAction"/><saf:a href="%{url}">Tree Example (dynamic)</saf:a>
- <li><saf:url id="url" value="componentTagExample.jsp"/><saf:a href="%{#url}">Component Tag Example</saf:a>
- <%--li><saf:url id="url" namespace="/tags/ui" action="populateUsingIterator" method="input" /><saf:a href="%{url}">UI population using iterator tag</saf:a></li--%>
- </ul>
+ <h1>UI Tags</h1>
+
+ <ul>
+ <li><s:url id="url" namespace="/tags/ui" action="example" method="input" /><s:a href="%{url}">UI Example</s:a></li>
+ <li><s:url id="url" namespace="/tags/ui" action="exampleVelocity" method="input" /><s:a href="%{url}">UI Example (Velocity)</s:a></li>
+ <li><s:url id="url" namespace="/tags/ui" action="lotsOfOptiontransferselect" method="input" /><s:a href="%{url}">Option Transfer Select UI Example</s:a></li>
+ <li><s:url id="url" namespace="/tags/ui" action="lotsOfRichtexteditor" method="input" /><s:a href="%{url}">Rich Text Editor UI Example</s:a></li>
+ <li><s:url id="url" namespace="/tags/ui" value="treeExampleStatic.jsp" /><s:a href="%{url}">Tree Example (static)</s:a>
+ <li><s:url id="url" namespace="/tags/ui" action="showDynamicTreeAction"/><s:a href="%{url}">Tree Example (dynamic)</s:a>
+ <li><s:url id="url" value="componentTagExample.jsp"/><s:a href="%{#url}">Component Tag Example</s:a>
+ <%--li><s:url id="url" namespace="/tags/ui" action="populateUsingIterator" method="input" /><s:a href="%{url}">UI population using iterator tag</s:a></li--%>
+ </ul>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp Thu Jul 20 18:04:41 2006
@@ -1,109 +1,109 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Show Case - Tags - UI Tags - Optiontransferselect</title>
-<saf:head />
+<s:head />
</head>
<body>
-<saf:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
- <saf:optiontransferselect
- tooltip="Select Your Favourite Cartoon Characters"
- headerKey="-1"
- headerValue="--- Please Select ---"
- doubleHeaderKey="-1"
- doubleHeaderValue="--- Please Select ---"
- emptyOption="true"
- doubleEmptyOption="true"
- label="Favourite Cartoon Characters"
- leftTitle="Favourite Cartoon Characters"
- rightTitle="Non Favourite Cartoon Characters"
- name="favouriteCartoonCharacters"
- list="defaultFavouriteCartoonCharacters"
- doubleName="notFavouriteCartoonCharacters"
- doubleList="defaultNotFavouriteCartoonCharacters" />
-
- <br/>
-
- <saf:optiontransferselect
- tooltip="Select Your Favourite Cars"
- label="Favourite Cars"
- leftTitle="Favourite Cars"
- rightTitle="Non Favourite Cars"
- name="favouriteCars"
- list="defaultFavouriteCars"
- doubleName="notFavouriteCars"
- doubleList="defaultNotFavouriteCars" />
-
- <br/>
-
- <saf:optiontransferselect
- tooltip="Select Your Favourite Motorcycles"
- headerKey="-1"
- headerValue="--- Please Select ---"
- doubleHeaderKey="-1"
- doubleHeaderValue="--- Please Select ---"
- label="Favourite Motorcycles"
- leftTitle="Favourite Motorcycles"
- rightTitle="Non Favourite Motorcycles"
- name="favouriteMotorcycles"
- list="defaultFavouriteMotorcycles"
- doubleName="notFavouriteMotorcycles"
- doubleList="defaultNotFavouriteMotorcycles" />
-
- <br/>
-
- <saf:optiontransferselect
- tooltip="Select Your Favourite Countries"
- emptyOption="true"
- doubleEmptyOption="true"
- label="Favourite Countries"
- leftTitle="Favourite Countries"
- rightTitle="Non Favourite Countries"
- name="favouriteCountries"
- list="defaultFavouriteCountries"
- doubleName="notFavouriteCountries"
- doubleList="defaultNotFavouriteCountries"
- />
-
- <br/>
-
- <saf:updownselect
- tooltip="Prioritized Your Favourite Cartoon Characters"
- label="Prioritised Favourite Cartoon Characters"
- list="defaultFavouriteCartoonCharacters"
- name="prioritisedFavouriteCartoonCharacters"
- headerKey="-1"
- headerValue="--- Please Order ---"
- emptyOption="true" />
-
- <br/>
-
- <saf:updownselect
- tooltip="Prioritise Your Favourite Cars"
- label="Prioritised Favourite Cars"
- list="defaultFavouriteCars"
- name="prioritisedFavouriteCars"
- headerKey="-10"
- headerValue="--- Please Order ---" />
-
- <br/>
-
- <saf:updownselect
- tooltip="Prioritised Your Favourite Countries"
- label="Prioritised Favourite Countries"
- list="defaultFavouriteCountries"
- name="prioritisedFavouriteCountries"
- emptyOption="true"
- value="{'england', 'brazil'}" />
-
- <br/>
-
- <saf:submit value="Submit It" />
-
- <br/>
-
-</saf:form>
+<s:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
+ <s:optiontransferselect
+ tooltip="Select Your Favourite Cartoon Characters"
+ headerKey="-1"
+ headerValue="--- Please Select ---"
+ doubleHeaderKey="-1"
+ doubleHeaderValue="--- Please Select ---"
+ emptyOption="true"
+ doubleEmptyOption="true"
+ label="Favourite Cartoon Characters"
+ leftTitle="Favourite Cartoon Characters"
+ rightTitle="Non Favourite Cartoon Characters"
+ name="favouriteCartoonCharacters"
+ list="defaultFavouriteCartoonCharacters"
+ doubleName="notFavouriteCartoonCharacters"
+ doubleList="defaultNotFavouriteCartoonCharacters" />
+
+ <br/>
+
+ <s:optiontransferselect
+ tooltip="Select Your Favourite Cars"
+ label="Favourite Cars"
+ leftTitle="Favourite Cars"
+ rightTitle="Non Favourite Cars"
+ name="favouriteCars"
+ list="defaultFavouriteCars"
+ doubleName="notFavouriteCars"
+ doubleList="defaultNotFavouriteCars" />
+
+ <br/>
+
+ <s:optiontransferselect
+ tooltip="Select Your Favourite Motorcycles"
+ headerKey="-1"
+ headerValue="--- Please Select ---"
+ doubleHeaderKey="-1"
+ doubleHeaderValue="--- Please Select ---"
+ label="Favourite Motorcycles"
+ leftTitle="Favourite Motorcycles"
+ rightTitle="Non Favourite Motorcycles"
+ name="favouriteMotorcycles"
+ list="defaultFavouriteMotorcycles"
+ doubleName="notFavouriteMotorcycles"
+ doubleList="defaultNotFavouriteMotorcycles" />
+
+ <br/>
+
+ <s:optiontransferselect
+ tooltip="Select Your Favourite Countries"
+ emptyOption="true"
+ doubleEmptyOption="true"
+ label="Favourite Countries"
+ leftTitle="Favourite Countries"
+ rightTitle="Non Favourite Countries"
+ name="favouriteCountries"
+ list="defaultFavouriteCountries"
+ doubleName="notFavouriteCountries"
+ doubleList="defaultNotFavouriteCountries"
+ />
+
+ <br/>
+
+ <s:updownselect
+ tooltip="Prioritized Your Favourite Cartoon Characters"
+ label="Prioritised Favourite Cartoon Characters"
+ list="defaultFavouriteCartoonCharacters"
+ name="prioritisedFavouriteCartoonCharacters"
+ headerKey="-1"
+ headerValue="--- Please Order ---"
+ emptyOption="true" />
+
+ <br/>
+
+ <s:updownselect
+ tooltip="Prioritise Your Favourite Cars"
+ label="Prioritised Favourite Cars"
+ list="defaultFavouriteCars"
+ name="prioritisedFavouriteCars"
+ headerKey="-10"
+ headerValue="--- Please Order ---" />
+
+ <br/>
+
+ <s:updownselect
+ tooltip="Prioritised Your Favourite Countries"
+ label="Prioritised Favourite Countries"
+ list="defaultFavouriteCountries"
+ name="prioritisedFavouriteCountries"
+ emptyOption="true"
+ value="{'england', 'brazil'}" />
+
+ <br/>
+
+ <s:submit value="Submit It" />
+
+ <br/>
+
+</s:form>
</body>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp Thu Jul 20 18:04:41 2006
@@ -1,101 +1,101 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Showcase - Tags - UI Tags - Optiontransferoption Result</title>
</head>
<body>
-
- <table>
- <tr>
- <td>Favourite Cartoons:</td>
- <td>
- <saf:iterator value="favouriteCartoonCharacters" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Non Favourite Cartoons:</td>
- <td>
- <saf:iterator value="notFavouriteCartoonCharacters" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Favourite Cars:</td>
- <td>
- <saf:iterator value="favouriteCars" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Non Favourite Cars:</td>
- <td>
- <saf:iterator value="notFavouriteCars" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Favourite Motorcycles:</td>
- <td>
- <saf:iterator value="favouriteMotorcycles" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Non Favourite Motorcycles:</td>
- <td>
- <saf:iterator value="notFavouriteMotorcycles" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Favourite Countries:</td>
- <td>
- <saf:iterator value="favouriteCountries" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Non Favourite Countries:</td>
- <td>
- <saf:iterator value="notFavouriteCountries" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Prioritised Favourite Cartoon Characters:</td>
- <td>
- <saf:iterator value="prioritisedFavouriteCartoonCharacters" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Prioritised Favourite Cars:</td>
- <td>
- <saf:iterator value="prioritisedFavouriteCars" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- <tr>
- <td>Prioritised Favourite Countries</td>
- <td>
- <saf:iterator value="prioritisedFavouriteCountries" status="stat">
- <saf:property value="%{#stat.count}" />.<saf:property />
- </saf:iterator>
- </td>
- </tr>
- </table>
+
+ <table>
+ <tr>
+ <td>Favourite Cartoons:</td>
+ <td>
+ <s:iterator value="favouriteCartoonCharacters" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Non Favourite Cartoons:</td>
+ <td>
+ <s:iterator value="notFavouriteCartoonCharacters" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Favourite Cars:</td>
+ <td>
+ <s:iterator value="favouriteCars" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Non Favourite Cars:</td>
+ <td>
+ <s:iterator value="notFavouriteCars" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Favourite Motorcycles:</td>
+ <td>
+ <s:iterator value="favouriteMotorcycles" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Non Favourite Motorcycles:</td>
+ <td>
+ <s:iterator value="notFavouriteMotorcycles" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Favourite Countries:</td>
+ <td>
+ <s:iterator value="favouriteCountries" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Non Favourite Countries:</td>
+ <td>
+ <s:iterator value="notFavouriteCountries" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Prioritised Favourite Cartoon Characters:</td>
+ <td>
+ <s:iterator value="prioritisedFavouriteCartoonCharacters" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Prioritised Favourite Cars:</td>
+ <td>
+ <s:iterator value="prioritisedFavouriteCars" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ <tr>
+ <td>Prioritised Favourite Countries</td>
+ <td>
+ <s:iterator value="prioritisedFavouriteCountries" status="stat">
+ <s:property value="%{#stat.count}" />.<s:property />
+ </s:iterator>
+ </td>
+ </tr>
+ </table>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<%
request.setAttribute("decorator", "none");
@@ -10,18 +10,18 @@
<%--
<script>
- var widget = dojo.widget.byId("parentId");
- alert(widget.selectedNode);
- if (widget.selectedNode != null) {
- var inputElement = dojo.byId('sId');
- inputElement.value='true';
- alert(inputElement+'\t'+inputElement.value);
- }
- else {
- var inputElement = dojo.byId('sId');
- inputElement.value='false';
- alert(inputElement+'\t'+inputElement.value);
- }
+ var widget = dojo.widget.byId("parentId");
+ alert(widget.selectedNode);
+ if (widget.selectedNode != null) {
+ var inputElement = dojo.byId('sId');
+ inputElement.value='true';
+ alert(inputElement+'\t'+inputElement.value);
+ }
+ else {
+ var inputElement = dojo.byId('sId');
+ inputElement.value='false';
+ alert(inputElement+'\t'+inputElement.value);
+ }
</script>
--%>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp Thu Jul 20 18:04:41 2006
@@ -1,40 +1,40 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Showcase - UI Tag Example - Tree Example (Dynamic)</title>
-<saf:head theme="ajax" debug="true" />
+<s:head theme="ajax" debug="true" />
</head>
<body>
<!-- START SNIPPET: treeExampleDynamicJsp -->
<script>
- function treeNodeSelected(nodeId) {
- dojo.io.bind({
- url: "<saf:url value='/tags/ui/ajax/dynamicTreeSelectAction.action' />?nodeId="+nodeId,
- load: function(type, data, evt) {
- var displayDiv = dojo.byId("displayId");
- displayDiv.innerHTML = data;
- },
- mimeType: "text/html"
- });
- };
+ function treeNodeSelected(nodeId) {
+ dojo.io.bind({
+ url: "<s:url value='/tags/ui/ajax/dynamicTreeSelectAction.action' />?nodeId="+nodeId,
+ load: function(type, data, evt) {
+ var displayDiv = dojo.byId("displayId");
+ displayDiv.innerHTML = data;
+ },
+ mimeType: "text/html"
+ });
+ };
- dojo.event.topic.subscribe("treeSelected", this, "treeNodeSelected");
+ dojo.event.topic.subscribe("treeSelected", this, "treeNodeSelected");
</script>
<div style="float:left; margin-right: 50px;">
-<saf:tree
- theme="ajax"
- rootNode="%{treeRootNode}"
- childCollectionProperty="children"
- nodeIdProperty="id"
- nodeTitleProperty="name"
- treeSelectedTopic="treeSelected">
-</saf:tree>
+<s:tree
+ theme="ajax"
+ rootNode="%{treeRootNode}"
+ childCollectionProperty="children"
+ nodeIdProperty="id"
+ nodeTitleProperty="name"
+ treeSelectedTopic="treeSelected">
+</s:tree>
</div>
<div id="displayId">
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp Thu Jul 20 18:04:41 2006
@@ -1,45 +1,45 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Showcase - UI Tag Example - Tree Example (Static)</title>
-<saf:head theme="ajax" debug="true" />
+<s:head theme="ajax" debug="true" />
</head>
<body>
<!-- START SNIPPET: treeExampleStaticJsp -->
<script>
- function treeNodeSelected(nodeId) {
- dojo.io.bind({
- url: "<saf:url value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+nodeId,
- load: function(type, data, evt) {
- var divDisplay = dojo.byId("displayIt");
- divDisplay.innerHTML=data;
- },
- mimeType: "text/html"
- });
- };
+ function treeNodeSelected(nodeId) {
+ dojo.io.bind({
+ url: "<s:url value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+nodeId,
+ load: function(type, data, evt) {
+ var divDisplay = dojo.byId("displayIt");
+ divDisplay.innerHTML=data;
+ },
+ mimeType: "text/html"
+ });
+ };
- dojo.event.topic.subscribe("treeSelected", this, "treeNodeSelected");
+ dojo.event.topic.subscribe("treeSelected", this, "treeNodeSelected");
</script>
<div style="float:left; margin-right: 50px;">
-<saf:tree label="parent" id="parentId" theme="ajax" templateCssPath="/struts/tree.css"
+<s:tree label="parent" id="parentId" theme="ajax" templateCssPath="/struts/tree.css"
showRootGrid="true" showGrid="true" treeSelectedTopic="treeSelected">
- <saf:treenode theme="ajax" label="child1" id="child1Id">
- <saf:treenode theme="ajax" label="grandchild1" id="grandchild1Id"/>
- <saf:treenode theme="ajax" label="grandchild2" id="grandchild2Id"/>
- <saf:treenode theme="ajax" label="grandchild3" id="grandchild3Id"/>
- </saf:treenode>
- <saf:treenode theme="ajax" label="child2" id="child2Id"/>
- <saf:treenode theme="ajax" label="child3" id="child3Id"/>
- <saf:treenode theme="ajax" label="child4" id="child4Id"/>
- <saf:treenode theme="ajax" label="child5" id="child5Id">
- <saf:treenode theme="ajax" label="gChild1" id="gChild1Id"/>
- <saf:treenode theme="ajax" label="gChild2" id="gChild2Id"/>
- </saf:treenode>
-</saf:tree>
+ <s:treenode theme="ajax" label="child1" id="child1Id">
+ <s:treenode theme="ajax" label="grandchild1" id="grandchild1Id"/>
+ <s:treenode theme="ajax" label="grandchild2" id="grandchild2Id"/>
+ <s:treenode theme="ajax" label="grandchild3" id="grandchild3Id"/>
+ </s:treenode>
+ <s:treenode theme="ajax" label="child2" id="child2Id"/>
+ <s:treenode theme="ajax" label="child3" id="child3Id"/>
+ <s:treenode theme="ajax" label="child4" id="child4Id"/>
+ <s:treenode theme="ajax" label="child5" id="child5Id">
+ <s:treenode theme="ajax" label="gChild1" id="gChild1Id"/>
+ <s:treenode theme="ajax" label="gChild2" id="gChild2Id"/>
+ </s:treenode>
+</s:tree>
</div>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp Thu Jul 20 18:04:41 2006
@@ -1,9 +1,9 @@
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<div style="background-color:yellow;">
<p>
JSP Custom Template -
-parameter 'paramName' - <saf:property value="%{parameters.paramName}" />
+parameter 'paramName' - <s:property value="%{parameters.paramName}" />
</p>
</div>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
</head>
@@ -9,7 +9,7 @@
</p>
<p/>
- Click here to <saf:url id="back" value="/token"/><saf:a href="%{back}">return</saf:a>.
+ Click here to <s:url id="back" value="/token"/><s:a href="%{back}">return</s:a>.
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head><title>Token Examples</title></head>
@@ -10,15 +10,15 @@
happens once.
<p/>
- <br/>Balance of source account: <saf:property value="#session.balanceSource"/>
- <br/>Balance of destination account: <saf:property value="#session.balanceDestination"/>
+ <br/>Balance of source account: <s:property value="#session.balanceSource"/>
+ <br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
<p/>
- <saf:form action="transfer">
- <saf:token/>
- <saf:textfield label="Amount" name="amount" required="true" value="100"/>
- <saf:submit value="Transfer money"/>
- </saf:form>
+ <s:form action="transfer">
+ <s:token/>
+ <s:textfield label="Amount" name="amount" required="true" value="100"/>
+ <s:submit value="Transfer money"/>
+ </s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head><title>Token Examples</title></head>
@@ -10,15 +10,15 @@
happens once. This action will redirect after you have submitted the form.
<p/>
- <br/>Balance of source account: <saf:property value="#session.balanceSource"/>
- <br/>Balance of destination account: <saf:property value="#session.balanceDestination"/>
+ <br/>Balance of source account: <s:property value="#session.balanceSource"/>
+ <br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
<p/>
- <saf:form action="transfer2">
- <saf:token/>
- <saf:textfield label="Amount" name="amount" required="true" value="200"/>
- <saf:submit value="Transfer money"/>
- </saf:form>
+ <s:form action="transfer2">
+ <s:token/>
+ <s:textfield label="Amount" name="amount" required="true" value="200"/>
+ <s:submit value="Transfer money"/>
+ </s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head><title>Token Examples</title></head>
@@ -10,15 +10,15 @@
happens once. This example uses the token session based interceptor and redirect after post.
<p/>
- <br/>Balance of source account: <saf:property value="#session.balanceSource"/>
- <br/>Balance of destination account: <saf:property value="#session.balanceDestination"/>
+ <br/>Balance of source account: <s:property value="#session.balanceSource"/>
+ <br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
<p/>
- <saf:form action="transfer3">
- <saf:token/>
- <saf:textfield label="Amount" name="amount" required="true" value="300"/>
- <saf:submit value="Transfer money"/>
- </saf:form>
+ <s:form action="transfer3">
+ <s:token/>
+ <s:textfield label="Amount" name="amount" required="true" value="300"/>
+ <s:submit value="Transfer money"/>
+ </s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp Thu Jul 20 18:04:41 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head><title>Token Examples (double post)</title></head>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp Thu Jul 20 18:04:41 2006
@@ -1,14 +1,14 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head><title>Token Examples (double post)</title></head>
<body>
<h1>Token Examples</h1>
- The transfer is done at <saf:text name="token.transfer.time"><saf:param value="#session.time"/></saf:text>
+ The transfer is done at <s:text name="token.transfer.time"><s:param value="#session.time"/></s:text>
- <br/>New balance of source account: <saf:property value="#session.balanceSource"/>
- <br/>New balance of destination account: <saf:property value="#session.balanceDestination"/>
+ <br/>New balance of source account: <s:property value="#session.balanceSource"/>
+ <br/>New balance of destination account: <s:property value="#session.balanceDestination"/>
<p/>
Try using the browser back button and submit the form again. This should result in a double post
@@ -19,7 +19,7 @@
web page result from the first post.
<p/>
- Click here to <saf:url id="back" value="/token"/><saf:a href="%{back}">return</saf:a>.
+ Click here to <s:url id="back" value="/token"/><s:a href="%{back}">return</s:a>.
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp Thu Jul 20 18:04:41 2006
@@ -5,51 +5,51 @@
@version $Date: 2006/01/13 16:23:41 $ $Id: clientSideValidationExample.jsp,v 1.1 2006/01/13 16:23:41 rainerh Exp $
--%>
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
- <head>
- <title>Showcase - Validation - Field Validators Example</title>
- <saf:url id="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
- <saf:head />
- <!-- link rel="stylesheet" type="text/css" href='<saf:property value="%{siteCss}" />'-->
- </head>
- <body>
-
- <!-- START SNIPPET: fieldValidatorsExample -->
-
- <h3>All Field Errors Will Appear Here</h3>
- <saf:fielderror />
- <hr/>
-
- <h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
- <saf:fielderror>
- <saf:param value="%{'requiredStringValidatorField'}" />
- </saf:fielderror>
- <hr/>
-
- <h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
- <saf:fielderror>
- <saf:param>stringLengthValidatorField</saf:param>
- </saf:fielderror>
- <hr/>
-
- <saf:form action="submitClientSideValidationExample" namespace="/validation" method="POST" validate="true">
- <saf:textfield label="Required Validator Field" name="requiredValidatorField" />
- <saf:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
- <saf:textfield label="Integer Validator Field" name="integerValidatorField" />
- <saf:textfield label="Date Validator Field" name="dateValidatorField" />
- <saf:textfield label="Email Validator Field" name="emailValidatorField" />
- <saf:textfield label="URL Validator Field" name="urlValidatorField" />
- <saf:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
- <saf:textfield label="Regex Validator Field" name="regexValidatorField"/>
- <saf:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
- <saf:submit label="Submit" />
- </saf:form>
+ <head>
+ <title>Showcase - Validation - Field Validators Example</title>
+ <s:url id="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
+ <s:head />
+ <!-- link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />'-->
+ </head>
+ <body>
+
+ <!-- START SNIPPET: fieldValidatorsExample -->
+
+ <h3>All Field Errors Will Appear Here</h3>
+ <s:fielderror />
+ <hr/>
+
+ <h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
+ <s:fielderror>
+ <s:param value="%{'requiredStringValidatorField'}" />
+ </s:fielderror>
+ <hr/>
+
+ <h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
+ <s:fielderror>
+ <s:param>stringLengthValidatorField</s:param>
+ </s:fielderror>
+ <hr/>
+
+ <s:form action="submitClientSideValidationExample" namespace="/validation" method="POST" validate="true">
+ <s:textfield label="Required Validator Field" name="requiredValidatorField" />
+ <s:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
+ <s:textfield label="Integer Validator Field" name="integerValidatorField" />
+ <s:textfield label="Date Validator Field" name="dateValidatorField" />
+ <s:textfield label="Email Validator Field" name="emailValidatorField" />
+ <s:textfield label="URL Validator Field" name="urlValidatorField" />
+ <s:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
+ <s:textfield label="Regex Validator Field" name="regexValidatorField"/>
+ <s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
+ <s:submit label="Submit" />
+ </s:form>
<!-- END SNIPPET: fieldValidatorsExample -->
- <saf:include value="footer.jsp" />
- </body>
+ <s:include value="footer.jsp" />
+ </body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp Thu Jul 20 18:04:41 2006
@@ -5,51 +5,51 @@
@version $Date: 2006/01/13 16:23:43 $ $Id: fieldValidatorsExample.jsp,v 1.4 2006/01/13 16:23:43 rainerh Exp $
--%>
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
- <head>
- <title>Showcase - Validation - Field Validators Example</title>
- <saf:url id="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
- <saf:head theme="xhtml"/>
- <!-- link rel="stylesheet" type="text/css" href='<saf:property value="%{siteCss}" />'-->
- </head>
- <body>
-
- <!-- START SNIPPET: fieldValidatorsExample -->
-
- <h3>All Field Errors Will Appear Here</h3>
- <saf:fielderror />
- <hr/>
-
- <h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
- <saf:fielderror>
- <saf:param value="%{'requiredStringValidatorField'}" />
- </saf:fielderror>
- <hr/>
-
- <h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
- <saf:fielderror>
- <saf:param>stringLengthValidatorField</saf:param>
- </saf:fielderror>
- <hr/>
-
- <saf:form action="submitFieldValidatorsExamples" namespace="/validation" method="POST" theme="xhtml">
- <saf:textfield label="Required Validator Field" name="requiredValidatorField" />
- <saf:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
- <saf:textfield label="Integer Validator Field" name="integerValidatorField" />
- <saf:textfield label="Date Validator Field" name="dateValidatorField" />
- <saf:textfield label="Email Validator Field" name="emailValidatorField" />
- <saf:textfield label="URL Validator Field" name="urlValidatorField" />
- <saf:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
- <saf:textfield label="Regex Validator Field" name="regexValidatorField"/>
- <saf:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
- <saf:submit label="Submit" />
- </saf:form>
-
+ <head>
+ <title>Showcase - Validation - Field Validators Example</title>
+ <s:url id="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
+ <s:head theme="xhtml"/>
+ <!-- link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />'-->
+ </head>
+ <body>
+
+ <!-- START SNIPPET: fieldValidatorsExample -->
+
+ <h3>All Field Errors Will Appear Here</h3>
+ <s:fielderror />
+ <hr/>
+
+ <h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
+ <s:fielderror>
+ <s:param value="%{'requiredStringValidatorField'}" />
+ </s:fielderror>
+ <hr/>
+
+ <h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
+ <s:fielderror>
+ <s:param>stringLengthValidatorField</s:param>
+ </s:fielderror>
+ <hr/>
+
+ <s:form action="submitFieldValidatorsExamples" namespace="/validation" method="POST" theme="xhtml">
+ <s:textfield label="Required Validator Field" name="requiredValidatorField" />
+ <s:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
+ <s:textfield label="Integer Validator Field" name="integerValidatorField" />
+ <s:textfield label="Date Validator Field" name="dateValidatorField" />
+ <s:textfield label="Email Validator Field" name="emailValidatorField" />
+ <s:textfield label="URL Validator Field" name="urlValidatorField" />
+ <s:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
+ <s:textfield label="Regex Validator Field" name="regexValidatorField"/>
+ <s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
+ <s:submit label="Submit" />
+ </s:form>
+
<!-- END SNIPPET: fieldValidatorsExample -->
-
-
- <saf:include value="footer.jsp" />
- </body>
+
+
+ <s:include value="footer.jsp" />
+ </body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp Thu Jul 20 18:04:41 2006
@@ -1,9 +1,9 @@
-<%@taglib uri="/struts-action" prefix="saf" %>
+ <%@taglib prefix="s" uri="/tags" %>
<hr/>
-<saf:url id="backToValidationExamples" action="list" namespace="/validation" />
-<saf:url id="backToShowCase" action="showcase" namespace="/" />
-
-<saf:a href="%{backToValidationExamples}">Back To Validation Examples</saf:a>
-<saf:a href="%{backToShowCase}">Back To Showcase</saf:a>
+<s:url id="backToValidationExamples" action="list" namespace="/validation" />
+<s:url id="backToShowCase" action="showcase" namespace="/" />
+
+<s:a href="%{backToValidationExamples}">Back To Validation Examples</s:a>
+<s:a href="%{backToShowCase}">Back To Showcase</s:a>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp Thu Jul 20 18:04:41 2006
@@ -1,40 +1,40 @@
<%--
- index.jsp
+ index.jsp
- @author tm_jee
- @version $Date: 2006/01/13 16:23:44 $ $Id: index.jsp,v 1.4 2006/01/13 16:23:44 rainerh Exp $
+ @author tm_jee
+ @version $Date: 2006/01/13 16:23:44 $ $Id: index.jsp,v 1.4 2006/01/13 16:23:44 rainerh Exp $
--%>
-<%@taglib uri="/struts-action" prefix="saf" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
- <head>
- <title>Showcase - Validation</title>
- </head>
- <body>
- <h1>Validation Examples</h1>
-
- <saf:url id="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
- <saf:url id="quizClient" namespace="/validation" action="quizClient" method="input"/>
- <saf:url id="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
- <saf:url id="quizAjax" namespace="/validation" action="quizAjax" method="input"/>
- <saf:url id="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation" />
- <saf:url id="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation" />
- <saf:url id="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation" />
- <saf:url id="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation" />
- <saf:url id="backToShowcase" action="showcase" namespace="/" />
-
- <ul>
- <li><saf:a href="%{quizBasic}">Validation (basic)</saf:a></li>
- <li><saf:a href="%{quizClient}">Validation (client)</saf:a></li>
- <li><saf:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</saf:a></li>
- <li><saf:a href="%{quizAjax}">Validation (ajax)</saf:a></li>
- <li><saf:a href="%{fieldValidatorUrl}">Field Validators</saf:a></li>
- <li><saf:a href="%{nonFieldValidatorUrl}">Non Field Validator</saf:a></li>
- <li><saf:a href="%{visitorValidatorUrl}">Visitor Validator</saf:a></li>
- <li><saf:a href="%{clientSideValidationUrl}">Client side validation using JavaScript</saf:a></li>
- <li><saf:a href="%{backToShowcase}">Back To Showcase</saf:a>
- </ul>
- </body>
+ <head>
+ <title>Showcase - Validation</title>
+ </head>
+ <body>
+ <h1>Validation Examples</h1>
+
+ <s:url id="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
+ <s:url id="quizClient" namespace="/validation" action="quizClient" method="input"/>
+ <s:url id="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
+ <s:url id="quizAjax" namespace="/validation" action="quizAjax" method="input"/>
+ <s:url id="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation" />
+ <s:url id="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation" />
+ <s:url id="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation" />
+ <s:url id="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation" />
+ <s:url id="backToShowcase" action="showcase" namespace="/" />
+
+ <ul>
+ <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
+ <li><s:a href="%{quizClient}">Validation (client)</s:a></li>
+ <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
+ <li><s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
+ <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li>
+ <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li>
+ <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
+ <li><s:a href="%{clientSideValidationUrl}">Client side validation using JavaScript</s:a></li>
+ <li><s:a href="%{backToShowcase}">Back To Showcase</s:a>
+ </ul>
+ </body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp Thu Jul 20 18:04:41 2006
@@ -1,38 +1,38 @@
<%--
- nonFieldValidatorsExample.jsp
-
- @author tm_jee
- @version $Date: 2005/12/24 09:22:28 $ $Id: nonFieldValidatorsExample.jsp,v 1.3 2005/12/24 09:22:28 tmjee Exp $
+ nonFieldValidatorsExample.jsp
+
+ @author tm_jee
+ @version $Date: 2005/12/24 09:22:28 $ $Id: nonFieldValidatorsExample.jsp,v 1.3 2005/12/24 09:22:28 tmjee Exp $
--%>
-<%@taglib prefix="saf" uri="/struts-action" %>
+<%@taglib prefix="s" uri="/tags" %>
<html>
- <head>
- <title>Showcase - Validation - Non Field Validator Example</title>
- <saf:url id="siteCss" value="/validation/validationExamplesStyles.css" includeContext="true" />
- <saf:head />
- <!-- link rel="stylesheet" type="text/css" href='<saf:property value="%{siteCss}" />'-->
- </head>
- <body>
-
-
- <!-- START SNIPPET: nonFieldValidatorsExample -->
- <saf:actionerror />
-
- <saf:form method="POST" action="submitNonFieldValidatorsExamples" namespace="/validation">
- <saf:textfield name="someText" label="Some Text" />
- <saf:textfield name="someTextRetype" label="Retype Some Text" />
- <saf:textfield name="someTextRetypeAgain" label="Retype Some Text Again" />
- <saf:submit label="Submit" />
- </saf:form>
-
-
- <!-- END SNIPPET: nonFieldValidatorsExample -->
-
-
- <saf:include value="footer.jsp" />
- </body>
+ <head>
+ <title>Showcase - Validation - Non Field Validator Example</title>
+ <s:url id="siteCss" value="/validation/validationExamplesStyles.css" includeContext="true" />
+ <s:head />
+ <!-- link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />'-->
+ </head>
+ <body>
+
+
+ <!-- START SNIPPET: nonFieldValidatorsExample -->
+ <s:actionerror />
+
+ <s:form method="POST" action="submitNonFieldValidatorsExamples" namespace="/validation">
+ <s:textfield name="someText" label="Some Text" />
+ <s:textfield name="someTextRetype" label="Retype Some Text" />
+ <s:textfield name="someTextRetypeAgain" label="Retype Some Text Again" />
+ <s:submit label="Submit" />
+ </s:form>
+
+
+ <!-- END SNIPPET: nonFieldValidatorsExample -->
+
+
+ <s:include value="footer.jsp" />
+ </body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp Thu Jul 20 18:04:41 2006
@@ -1,21 +1,21 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!-- START SNIPPET: ajaxValidation -->
<html>
<head>
<title>Validation - Basic</title>
- <saf:head theme="ajax"/>
+ <s:head theme="ajax"/>
</head>
<body>
-<saf:form method="post" validate="true" theme="ajax">
- <saf:textfield label="Name" name="name"/>
- <saf:textfield label="Age" name="age"/>
- <saf:textfield label="Favorite color" name="answer"/>
- <saf:submit/>
-</saf:form>
+<s:form method="post" validate="true" theme="ajax">
+ <s:textfield label="Name" name="name"/>
+ <s:textfield label="Age" name="age"/>
+ <s:textfield label="Favorite color" name="answer"/>
+ <s:submit/>
+</s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp Thu Jul 20 18:04:41 2006
@@ -1,11 +1,11 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!-- START SNIPPET: basicValidation -->
<html>
<head>
<title>Validation - Basic</title>
- <saf:head/>
+ <s:head/>
</head>
<body>
@@ -13,12 +13,12 @@
<b>What is your favorite color?</b>
<p/>
-<saf:form method="post">
- <saf:textfield label="Name" name="name"/>
- <saf:textfield label="Age" name="age"/>
- <saf:textfield label="Favorite color" name="answer"/>
- <saf:submit/>
-</saf:form>
+<s:form method="post">
+ <s:textfield label="Name" name="name"/>
+ <s:textfield label="Age" name="age"/>
+ <s:textfield label="Favorite color" name="answer"/>
+ <s:submit/>
+</s:form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp?rev=424152&r1=424151&r2=424152&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp Thu Jul 20 18:04:41 2006
@@ -1,21 +1,21 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!-- START SNIPPET: clientCssValidation -->
<html>
<head>
<title>Validation - Basic</title>
- <saf:head theme="css_xhtml"/>
+ <s:head theme="css_xhtml"/>
</head>
<body>
-<saf:form method="post" theme="css_xhtml" validate="true">
- <saf:textfield label="Name" name="name"/>
- <saf:textfield label="Age" name="age"/>
- <saf:textfield label="Favorite color" name="answer"/>
- <saf:submit/>
-</saf:form>
+<s:form method="post" theme="css_xhtml" validate="true">
+ <s:textfield label="Name" name="name"/>
+ <s:textfield label="Age" name="age"/>
+ <s:textfield label="Favorite color" name="answer"/>
+ <s:submit/>
+</s:form>
</body>
</html>