You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/09 16:28:39 UTC

svn commit: r392735 [2/2] - in /incubator/webwork2/webapps/showcase/src/main/webapp: ./ WEB-INF/ WEB-INF/decorators/ actionchaining/ ajax/ ajax/remotediv/ ajax/remoteforms/ ajax/remotelink/ ajax/tabbedpanel/ ajax/widgets/ empmanager/ filedownload/ file...

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp Sun Apr  9 07:28:31 2006
@@ -1,12 +1,12 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
 <head>
     <title>UI Tags Example: Date</title>
-    <ww:head/>
+    <saf:head/>
 </head>
 
 <body>
-<ww:action id="myDate" name="date" namespace="/" executeResult="false" />
+<saf: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><ww:property value="#myDate.before.toString()"/></td>
+        <td><saf:property value="#myDate.before.toString()"/></td>
     </tr>
     <tr>
         <td><strong>Past date</strong></td>
         <td>toString()</td>
-        <td><ww:property value="#myDate.past.toString()"/></td>
+        <td><saf:property value="#myDate.past.toString()"/></td>
     </tr>
     <tr>
         <td><strong>Now date</strong></td>
         <td>toString()</td>
-        <td><ww:property value="#myDate.now.toString()"/></td>
+        <td><saf:property value="#myDate.now.toString()"/></td>
     </tr>
     <tr>
         <td><strong>Future date</strong></td>
         <td>toString()</td>
-        <td><ww:property value="#myDate.future.toString()"/></td>
+        <td><saf:property value="#myDate.future.toString()"/></td>
     </tr>
     <tr>
         <td><strong>After date</strong></td>
         <td>toString()</td>
-        <td><ww:property value="#myDate.after.toString()"/></td>
+        <td><saf:property value="#myDate.after.toString()"/></td>
     </tr>
     <tr>
         <td><strong>Current date</strong></td>
         <td>yyyy/MM/dd hh:mm:ss</td>
-        <td><ww:date name="#myDate.now" format="yyyy/MM/dd hh:mm:ss" /></td>
+        <td><saf: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><ww:date name="#myDate.now" format="dd.MM.yyyy hh:mm:ss" /></td>
+        <td><saf: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><ww:date name="#myDate.now" format="HH:mm:ss" /></td>
+        <td><saf:date name="#myDate.now" format="HH:mm:ss" /></td>
     </tr>
     <tr>
         <td><strong>Before date</strong></td>
         <td>MMM, dd yyyy</td>
-        <td><ww:date name="#myDate.before" format="MMM, dd yyyy" /></td>
+        <td><saf:date name="#myDate.before" format="MMM, dd yyyy" /></td>
     </tr>
     <tr>
         <td><strong>Before date</strong></td>
         <td>nice</td>
-        <td><ww:date name="#myDate.before" nice="true"/></td>
+        <td><saf:date name="#myDate.before" nice="true"/></td>
     </tr>
     <tr>
         <td><strong>After date</strong></td>
         <td>dd.MM.yyyy</td>
-        <td><ww:date name="#myDate.after" format="dd.MM.yyyy" /></td>
+        <td><saf:date name="#myDate.after" format="dd.MM.yyyy" /></td>
     </tr>
     <tr>
         <td><strong>After date</strong></td>
         <td>nice</td>
-        <td><ww:date name="#myDate.after" nice="true"/></td>
+        <td><saf:date name="#myDate.after" nice="true"/></td>
     </tr>
     <tr>
         <td><strong>Past date</strong></td>
         <td>dd/MM/yyyy hh:mm</td>
-        <td><ww:date name="#myDate.past" format="dd/MM/yyyy hh:mm"/></td>
+        <td><saf: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><ww:date name="#myDate.past" format="MM-dd-yy"/></td>
+        <td><saf:date name="#myDate.past" format="MM-dd-yy"/></td>
     </tr>
     <tr>
         <td><strong>Future date (fallback)</strong></td>
         <td>fallback</td>
-        <td><ww:date name="#myDate.future" /></td>
+        <td><saf:date name="#myDate.future" /></td>
     </tr>
     <tr>
         <td><strong>Past date</strong></td>
         <td>nice</td>
-        <td><ww:date name="#myDate.past" nice="true"/></td>
+        <td><saf:date name="#myDate.past" nice="true"/></td>
     </tr>
     <tr>
         <td><strong>Future date</strong></td>
         <td>nice</td>
-        <td><ww:date name="#myDate.future" nice="true"/></td>
+        <td><saf:date name="#myDate.future" nice="true"/></td>
     </tr>
 </table>
 </body>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -8,12 +8,12 @@
 <h1>Non UI Tags</h1>
 
 <ul>
-	<li><ww:url id="url" action="showActionTagDemo" namespace="/tags/non-ui/actionTag"/><ww:a href="%{url}">Action Tag</ww:a></li>
-	<li><ww:url id="url" value="date.jsp" /><ww:a href="%{url}">Date Tag</ww:a></li>
-	<li><ww:url id="url" action="showGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" /><ww:a href="%{url}">Iterator Generator Tag</ww:a></li>
-	<li><ww:url id="url" action="showAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" /><ww:a href="%{#url}">Append Iterator Tag</ww:a>
-	<li><ww:url id="url" action="showMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" /><ww:a href="%{#url}">Merge Iterator Demo</ww:a>
-	<li><ww:url id="url" action="showSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" /><ww:a href="%{#url}">Subset Tag</ww:a>
+	<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>
 </ul>
 
 </body>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -6,20 +6,20 @@
 </head>
 <body>
 
-	<ww:generator id="iterator1" separator="," val="%{iteratorValue1}" />
-	<ww:generator id="iterator2" separator="," val="%{iteratorValue2}" />
+	<saf:generator id="iterator1" separator="," val="%{iteratorValue1}" />
+	<saf:generator id="iterator2" separator="," val="%{iteratorValue2}" />
 	
-	<ww:append id="appendedIterator">
-		<ww:param value="%{#attr.iterator1}" />
-		<ww:param value="%{#attr.iterator2}" />
-	</ww:append>
+	<saf:append id="appendedIterator">
+		<saf:param value="%{#attr.iterator1}" />
+		<saf:param value="%{#attr.iterator2}" />
+	</saf:append>
 	
-	<ww:iterator value="#appendedIterator">
-		<ww:property /><br/>
-	</ww:iterator>
+	<saf:iterator value="#appendedIterator">
+		<saf:property /><br/>
+	</saf:iterator>
 	
-	<ww:url value="%{'/tags/non-ui/'}" id="url" /><ww:a href="%{#url}">Back To Non-UI Demo</ww:a>
-	<ww:url value="%{'/'}" id="url" /><ww:a href="%{#url}">Back To Showcase</ww:a>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -6,14 +6,14 @@
 </head>
 <body>
 
-	<ww:generator val="%{value}" separator="%{separator}" count="%{count}">
-		<ww:iterator value="%{top}">
-			<ww:property /><br/>
-		</ww:iterator>
-	</ww:generator>
+	<saf:generator val="%{value}" separator="%{separator}" count="%{count}">
+		<saf:iterator value="%{top}">
+			<saf:property /><br/>
+		</saf:iterator>
+	</saf:generator>
 
-	<ww:url value="%{'/tags/non-ui/'}" id="url" /><ww:a href="%{#url}">Back To Non-UI Demo</ww:a>
-	<ww:url value="%{'/'}" id="url" /><ww:a href="%{#url}">Back To Showcase</ww:a>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -6,20 +6,20 @@
 </head>
 <body>
 
-	<ww:generator id="iterator1" val="%{iteratorValue1}" separator="," />
-	<ww:generator id="iterator2" val="%{iteratorValue2}" separator="," />
+	<saf:generator id="iterator1" val="%{iteratorValue1}" separator="," />
+	<saf:generator id="iterator2" val="%{iteratorValue2}" separator="," />
 	
-	<ww:merge id="mergedIterator">
-		<ww:param value="%{#attr.iterator1}" />
-		<ww:param value="%{#attr.iterator2}" />
-	</ww:merge>
+	<saf:merge id="mergedIterator">
+		<saf:param value="%{#attr.iterator1}" />
+		<saf:param value="%{#attr.iterator2}" />
+	</saf:merge>
 	
-	<ww:iterator value="%{#mergedIterator}">
-		<ww:property /><br/>
-	</ww:iterator>
+	<saf:iterator value="%{#mergedIterator}">
+		<saf:property /><br/>
+	</saf:iterator>
 
-	<ww:url value="%{'/tags/non-ui/'}" id="url" /><ww:a href="%{#url}">Back To Non-UI Demo</ww:a>
-	<ww:url value="%{'/'}" id="url" /><ww:a href="%{#url}">Back To Showcase</ww:a>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -6,14 +6,14 @@
 </head>
 <body>
 
-	<ww:actionerror/>
-	<ww:actionmessage/>
+	<saf:actionerror/>
+	<saf:actionmessage/>
 
-	<ww:form action="submitAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" method="POST">
-		<ww:textfield label="iterator 1 values (comma separated)" name="iteratorValue1" />
-		<ww:textfield label="iterator 2 values (comma separated)" name="iteratorValue2" />
-		<ww:submit />
-	</ww:form>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp Sun Apr  9 07:28:31 2006
@@ -1,21 +1,21 @@
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 <head>
 <title>Showcase - Tag - Non Ui Tag - Iterator Generator Tag Demo</title>
-<ww:head/>
+<saf:head/>
 </head>
 <body>
 
-	<ww:actionerror/>
-	<ww:actionmessage/>
+	<saf:actionerror/>
+	<saf:actionmessage/>
 	
-	<ww:form action="submitGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" method="POST">
-		<ww:textfield label="Value" name="value" />
-		<ww:textfield label="Separator" name="separator" />
-		<ww:textfield label="Count" name="count" />
-		<ww:submit />
-	</ww:form>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 <head>
@@ -6,11 +6,11 @@
 </head>
 <body>
 
-	<ww:form action="submitMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" method="POST">
-		<ww:textfield label="Iterator 1 Value (Comma Separated)" name="iteratorValue1" />
-		<ww:textfield label="Iterator 2 Value (Comma Separated)" name="iteratorValue2" />
-		<ww:submit />
-	</ww:form>
+	<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>
 
 
 </body>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 <head>
@@ -6,15 +6,15 @@
 </head>
 <body>
 
-	<ww:actionerror/>
-	<ww:actionmessage/>
+	<saf:actionerror/>
+	<saf:actionmessage/>
 
-	<ww:form action="submitSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" method="POST">
-		<ww:textfield label="Iterator value (comma separated)" name="iteratorValue" />
-		<ww:textfield label="Count" name="count" />
-		<ww:textfield label="Start" name="start" />
-		<ww:submit />
-	</ww:form>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -6,16 +6,16 @@
 </head>
 <body>
 
-	<ww:generator id="iterator" val="%{iteratorValue}" separator="," />
+	<saf:generator id="iterator" val="%{iteratorValue}" separator="," />
 
-	<ww:subset count="%{count}" start="%{start}" source="%{#attr.iterator}" >
-		<ww:iterator>
-			<ww:property /><br/>
-		</ww:iterator>
-	</ww:subset>
+	<saf:subset count="%{count}" start="%{start}" source="%{#attr.iterator}" >
+		<saf:iterator>
+			<saf:property /><br/>
+		</saf:iterator>
+	</saf:subset>
 
-	<ww:url value="%{'/tags/non-ui/'}" id="url" /><ww:a href="%{#url}">Back To Non-UI Demo</ww:a>
-	<ww:url value="%{'/'}" id="url" /><ww:a href="%{#url}">Back To Showcase</ww:a>
+	<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/example.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/example.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/example.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/example.jsp Sun Apr  9 07:28:31 2006
@@ -1,32 +1,32 @@
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
 <head>
     <title>UI Tags Example</title>
-    <ww:head/>
+    <saf:head/>
 </head>
 
 <body>
 
-<ww:form action="exampleSubmit" method="post" enctype="multipart/form-data">
-    <ww:textfield 
+<saf:form action="exampleSubmit" method="post" enctype="multipart/form-data">
+    <saf:textfield 
     		label="Name" 
     		name="name"
     		tooltip="Enter your Name here" />
 
-    <ww:datepicker
+    <saf:datepicker
     		tooltip="Select Your Birthday"
     		label="Birthday"
     		name="birthday" />
 
-    <ww:textarea
+    <saf:textarea
     		tooltip="Enter your Biography"
     		label="Biograph"
     		name="bio"
     		cols="20"
     		rows="3"/>
 
-    <ww:select
+    <saf:select
     		tooltip="Choose Your Favourite Color"
     		label="Favorite Color"
     		list="{'Red', 'Blue', 'Green'}"
@@ -35,7 +35,7 @@
             headerKey="None"
             headerValue="None"/>
 
-    <ww:select
+    <saf:select
     		tooltip="Choose Your Favourite Language"
     		label="Favourite Language"
     		list="favouriteLanguages"
@@ -46,18 +46,18 @@
     		headerKey="None"
     		headerValue="None"/>
 
-    <ww:checkboxlist
+    <saf:checkboxlist
     		tooltip="Choose your Friends"
     		label="Friends"
     		list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
     		name="friends"/>
 
-    <ww:checkbox
+    <saf:checkbox
     		tooltip="Confirmed that your are Over 18"
     		label="Age 18+"
     		name="legalAge"/>
 
-    <ww:doubleselect
+    <saf:doubleselect
     		tooltip="Choose Your State"
     		label="State"
     		name="region" list="{'North', 'South'}"
@@ -69,7 +69,7 @@
             headerValue="---------- Please Select ----------"
             emptyOption="true" />
 
-    <ww:doubleselect
+    <saf:doubleselect
     		tooltip="Choose your Vehical"
     		label="Favourite Vehical"
     		name="favouriteVehicalType"
@@ -85,12 +85,12 @@
     		headerValue="---------- Please Select ----------"
     		emptyOption="true" />
 
-    <ww:file
+    <saf:file
     		tooltip="Upload Your Picture"
     		label="Picture" 
     		name="picture" />
     		
-    <ww:optiontransferselect
+    <saf:optiontransferselect
     		tooltip="Select Your Favourite Cartoon Characters"
     		label="Favourite Cartoons Characters"
 			name="leftSideCartoonCharacters" 
@@ -108,15 +108,15 @@
 			doubleEmptyOption="true"
 			doubleMultiple="true" />
     
-    <ww:richtexteditor
+    <saf:richtexteditor
     		width="700"
     		label="Your Thougths"
      		name="thoughts" 
      		tooltip="Enter your thoughts here" />
      		
-    <ww:submit onclick="alert('aaaa');" />
-    <ww:reset onclick="alert('bbbb');" />
-</ww:form>
+    <saf:submit onclick="alert('aaaa');" />
+    <saf:reset onclick="alert('bbbb');" />
+</saf:form>
     
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -8,35 +8,35 @@
 
 <h1>Example Submitted</h1>
 <table>
-	<ww:label label="Name" name="name" /> 
-	<ww:label label="Birthday" name="birthday" />
-	<ww:label label="Biography" name="bio" /> 
-	<ww:label label="Favourite Color" name="favouriteColor" /> 
-	<ww:label label="Friends" name="friends" /> 
-	<ww:label label="Legal Age" name="legalAge" /> 
-	<ww:label label="Region" name="region" /> 
-	<ww:label label="State" name="state" /> 
-	<ww:label label="Picture" name="picture" /> 
-	<ww:label label="Favourite Language" name="favouriteLanguage" />
-	<ww:label label="Favourite Vehical Type" name="favouriteVehicalType" />
-	<ww:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
+	<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>
-			<ww:iterator value="leftSideCartoonCharacters" status="stat">
-				<ww:property value="%{#stat.count}" />.<ww:property value="top" />&nbsp;
-			</ww:iterator>
+			<saf:iterator value="leftSideCartoonCharacters" status="stat">
+				<saf:property value="%{#stat.count}" />.<saf:property value="top" />&nbsp;
+			</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td><label class="label">Favourite Cartoon Characters (Right):</label></td>
 		<td>
-			<ww:iterator value="rightSideCartoonCharacters" status="stat">
-				<ww:property value="%{#stat.count}" />.<ww:property value="top" />&nbsp;
-			</ww:iterator>
+			<saf:iterator value="rightSideCartoonCharacters" status="stat">
+				<saf:property value="%{#stat.count}" />.<saf:property value="top" />&nbsp;
+			</saf:iterator>
 		</td>
 	</tr>
-	<ww:label label="Thoughts" name="thoughts" />
+	<saf:label label="Thoughts" name="thoughts" />
 	
 </table>
 </body>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/index.jsp Sun Apr  9 07:28:31 2006
@@ -1,8 +1,4 @@
-<%--
-  ~ Copyright (c) 2006, Your Corporation. All Rights Reserved.
-  --%>
-
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 <head>
@@ -12,11 +8,11 @@
 	<h1>UI Tags</h1>
 	
 	<ul>
-		<li><ww:url id="url" namespace="/tags/ui" action="example" method="input" /><ww:a href="%{url}">UI Example</ww:a></li>
-		<li><ww:url id="url" namespace="/tags/ui" action="exampleVelocity" method="input" /><ww:a href="%{url}">UI Example (Velocity)</ww:a></li>
-		<li><ww:url id="url" namespace="/tags/ui" action="lotsOfOptiontransferselect" method="input" /><ww:a href="%{url}">Option Transfer Select UI Example</ww:a></li>
-		<li><ww:url id="url" namespace="/tags/ui" action="lotsOfRichtexteditor" method="input" /><ww:a href="%{url}">Rich Text Editor UI Example</ww:a></li>
-		<%--li><ww:url id="url" namespace="/tags/ui" action="populateUsingIterator" method="input" /><ww:a href="%{url}">UI population using iterator tag</ww:a></li--%>
+		<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" action="populateUsingIterator" method="input" /><saf:a href="%{url}">UI population using iterator tag</saf:a></li--%>
 	</ul>
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp Sun Apr  9 07:28:31 2006
@@ -1,14 +1,14 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
 <title>Show Case - Tags - UI Tags - Optiontransferselect</title>
-<ww:head />
+<saf:head />
 </head>
 <body>
 
-<ww:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
-	<ww:optiontransferselect 
+<saf:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
+	<saf:optiontransferselect 
 		tooltip="Select Your Favourite Cartoon Characters"
 		headerKey="-1"
 		headerValue="--- Please Select ---"
@@ -26,7 +26,7 @@
 		
 	<br/>	
 		
-	<ww:optiontransferselect
+	<saf:optiontransferselect
 		tooltip="Select Your Favourite Cars"
 		label="Favourite Cars"
 		leftTitle="Favourite Cars"
@@ -38,7 +38,7 @@
 		
 	<br/>
 		
-	<ww:optiontransferselect 
+	<saf:optiontransferselect 
 		tooltip="Select Your Favourite Motorcycles"
 		headerKey="-1"
 		headerValue="--- Please Select ---"
@@ -54,7 +54,7 @@
 		
 	<br/>
 		
-	<ww:optiontransferselect 
+	<saf:optiontransferselect 
 		tooltip="Select Your Favourite Countries"
 		emptyOption="true"
 		doubleEmptyOption="true"
@@ -69,7 +69,7 @@
 		
 	<br/>	
 	
-	<ww:updownselect 
+	<saf:updownselect 
 		tooltip="Prioritized Your Favourite Cartoon Characters"
 		label="Prioritised Favourite Cartoon Characters"
 		list="defaultFavouriteCartoonCharacters" 
@@ -80,7 +80,7 @@
 		
 	<br/>
 		
-	<ww:updownselect
+	<saf:updownselect
 		tooltip="Prioritise Your Favourite Cars"
 		label="Prioritised Favourite Cars"
 		list="defaultFavouriteCars"
@@ -90,7 +90,7 @@
 		
 	<br/>
 		
-	<ww:updownselect 
+	<saf:updownselect 
 		tooltip="Prioritised Your Favourite Countries"
 		label="Prioritised Favourite Countries"
 	    list="defaultFavouriteCountries"
@@ -100,10 +100,10 @@
 		
 	<br/>
 	
-	<ww:submit value="Submit It" />
+	<saf:submit value="Submit It" />
 	
 	<br/>
 	
-</ww:form>
+</saf:form>
 
 </body>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
@@ -10,89 +10,89 @@
 	<tr>
 		<td>Favourite Cartoons:</td>
 		<td>
-		<ww:iterator value="favouriteCartoonCharacters" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="favouriteCartoonCharacters" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Non Favourite Cartoons:</td>
 		<td>
-		<ww:iterator value="notFavouriteCartoonCharacters" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="notFavouriteCartoonCharacters" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Favourite Cars:</td>
 		<td>
-		<ww:iterator value="favouriteCars" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="favouriteCars" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Non Favourite Cars:</td>
 		<td>
-		<ww:iterator value="notFavouriteCars" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="notFavouriteCars" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Favourite Motorcycles:</td>
 		<td>
-		<ww:iterator value="favouriteMotorcycles" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="favouriteMotorcycles" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Non Favourite Motorcycles:</td>
 		<td>
-		<ww:iterator value="notFavouriteMotorcycles" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="notFavouriteMotorcycles" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Favourite Countries:</td>
 		<td>
-		<ww:iterator value="favouriteCountries" status="stat">
-			<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-		</ww:iterator>
+		<saf:iterator value="favouriteCountries" status="stat">
+			<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+		</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Non Favourite Countries:</td>
 		<td>
-			<ww:iterator value="notFavouriteCountries" status="stat">
-				<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-			</ww:iterator>
+			<saf:iterator value="notFavouriteCountries" status="stat">
+				<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+			</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Prioritised Favourite Cartoon Characters:</td>
 		<td>
-			<ww:iterator value="prioritisedFavouriteCartoonCharacters" status="stat">
-				<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-			</ww:iterator>
+			<saf:iterator value="prioritisedFavouriteCartoonCharacters" status="stat">
+				<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+			</saf:iterator>
 		</td>
 	</tr>
 	<tr>
 		<td>Prioritised Favourite Cars:</td>
 		<td>
-			<ww:iterator value="prioritisedFavouriteCars" status="stat">
-				<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-			</ww:iterator>
+			<saf:iterator value="prioritisedFavouriteCars" status="stat">
+				<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+			</saf:iterator>
 		</td>	
 	</tr>
 	<tr>
 		<td>Prioritised Favourite Countries</td>
 		<td>
-			<ww:iterator value="prioritisedFavouriteCountries" status="stat">
-				<ww:property value="%{#stat.count}" />.<ww:property />&nbsp;
-			</ww:iterator>
+			<saf:iterator value="prioritisedFavouriteCountries" status="stat">
+				<saf:property value="%{#stat.count}" />.<saf:property />&nbsp;
+			</saf:iterator>
 		</td>
 	</tr>
 	</table>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp Sun Apr  9 07:28:31 2006
@@ -1,36 +1,36 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
 	<title>Showcase - Tags - UI Tags - Rich Text Editor </title>
-	<ww:head />
+	<saf:head />
 </head>
 <body>
-	<ww:form action="lotsOfRichtexteditorSubmit" method="post" namespace="/tags/ui">
-		<ww:richtexteditor 
+	<saf:form action="lotsOfRichtexteditorSubmit" method="post" namespace="/tags/ui">
+		<saf:richtexteditor 
 			toolbarCanCollapse="false"
 			width="700"
 			label="Description 1" 
 			name="description1" 
 			/>
 			
-		<ww:richtexteditor 
+		<saf:richtexteditor 
 			toolbarCanCollapse="false"
 			width="700"
 			label="Description 2"
 			name="description2" />
 			
-		<ww:richtexteditor
+		<saf:richtexteditor
 			width="700"
 			label="Description 3"
 			name="description3" />
 			
-		<ww:richtexteditor
+		<saf:richtexteditor
 			width="700"
 			label="Description 4"
 			name="description4" />
 			
-		<ww:submit />
-	</ww:form>
+		<saf:submit />
+	</saf:form>
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp Sun Apr  9 07:28:31 2006
@@ -1,24 +1,24 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
 	<title>Showcase - Tags - UI Tags - Rich Text Editor </title>
-	<ww:head />
+	<saf:head />
 </head>
 <body>
-	<ww:label 
+	<saf:label 
 		label="Description 1" 
 		name="description1" />
 	<br/>
-	<ww:label
+	<saf:label
 		label="Description 2"
 		name="description2" />
 	<br/>
-	<ww:label
+	<saf:label
 		label="Description 3"
 		name="description3" />
 	<br/>
-	<ww:label
+	<saf:label
 		label="Description 4"
 		name="description4" />
 	<br/>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp Sun Apr  9 07:28:31 2006
@@ -1,44 +1,44 @@
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 <head>
 	<title>Showcase - Tags - UI Tags - Tooltip Example</title>
 </head>
 <body>
-	<ww:form action="someAction" 
+	<saf:form action="someAction" 
 		tooltipConfig="#{'tooltipAboveMousePointer':'false', 
 						 'tooltipLeftOfMousePointer':'true'}">
 		
-		<ww:url id="leopardPicture" value="images/leopard.jpg" />
-		<ww:url id="backgroundImage" value="images/backgroundImage.jpg" />
+		<saf:url id="leopardPicture" value="images/leopard.jpg" />
+		<saf:url id="backgroundImage" value="images/backgroundImage.jpg" />
 		
 		<!-- NOTE A: Set tooltip config through body of param tag -->
-		<ww:textfield 
+		<saf:textfield 
 			label="Customer Name" 
 			tooltip="One of our customer <br/><img src='%{leopardPicture}'">
-			<ww:param name="tooltipConfig">
+			<saf:param name="tooltipConfig">
 				tooltipWidth = 150 |
 				tooltipAboveMousePointer = false |
 				tooltipLeftOfMousePointer = false  
-			</ww:param>
-		</ww:textfield>
+			</saf:param>
+		</saf:textfield>
 		
 		
 		<!-- NOTE B: Set tooltip config through value attribute of param tag -->
-		<ww:textfield 
+		<saf:textfield 
 			label="Customer Address" 
 			tooltip="Enter The Customer Address, see <a href='#'>HERE</a> "> 
-			<ww:param 
+			<saf:param 
 				name="tooltipConfig" 
 				value="#{'tooltipStatic':'true',
 						 'tooltipSticky':'true',
 						 'tooltipAboveMousePointer':'false',
 						 'tooltipLeftOfMousePointer':'false'}"  />
-		</ww:textfield>	
+		</saf:textfield>	
 			
 			
 		<!--  NOTE C: Set tooltip config through tooltipConfig attribute of component tag -->	
-		<ww:textfield 
+		<saf:textfield 
 			label="Customer Telephone Number" 
 			tooltip="Enter customer Telephone Number" 
 			tooltipConfig="#{'tooltipBgColor':'#cccccc',
@@ -47,12 +47,12 @@
 							 'tooltipLeftOfMousePointer':'false'}" />
 
 		<!--  NOTE D: using the default tooltipConfig values -->							 
-		<ww:textfield 
+		<saf:textfield 
 			label="Customer Fax Number" 
 			tooltip="Properties inhertied from our Form" />
 			
 		<!--  NOTE E:  -->
-		<ww:textarea 
+		<saf:textarea 
 			label="Customer Comment" 
 			cols="70" 
 			rows="6" 
@@ -61,6 +61,6 @@
 						     'tooltipAboveMousePointer':'false',
 							 'tooltipLeftOfMousePointer':'false',
 							 'tooltipOpacity':'40'}" />	
-	</ww:form>
+	</saf:form>
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/token/doublePost.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/token/doublePost.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/token/doublePost.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/token/doublePost.jsp Sun Apr  9 07:28:31 2006
@@ -1,15 +1,15 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
 <head>
 </head>
 
 <body>
     <p style="border: 1px solid silver; padding: 5px; background: #ffd; text-align: center;">
-      Double post. WebWork intercepted this request and prevents the action from executing again.
+      Double post. Struts intercepted this request and prevents the action from executing again.
     </p>
 
     <p/>
-    Click here to <ww:url id="back" value="/token"/><ww:a href="%{back}">return</ww:a>.
+    Click here to <saf:url id="back" value="/token"/><saf:a href="%{back}">return</saf:a>.
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/token/example1.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/token/example1.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/token/example1.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/token/example1.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Token Examples</title></head>
 
@@ -10,15 +10,15 @@
     happens once.
     <p/>
 
-    <br/>Balance of source account: <ww:property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <ww:property value="#session.balanceDestination"/>
+    <br/>Balance of source account: <saf:property value="#session.balanceSource"/>
+    <br/>Balance of destination account: <saf:property value="#session.balanceDestination"/>
     <p/>
 
-    <ww:form action="transfer">
-        <ww:token/>
-        <ww:textfield label="Amount" name="amount" required="true" value="100"/>
-        <ww:submit value="Transfer money"/>
-    </ww:form>
+    <saf:form action="transfer">
+        <saf:token/>
+        <saf:textfield label="Amount" name="amount" required="true" value="100"/>
+        <saf:submit value="Transfer money"/>
+    </saf:form>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/token/example2.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/token/example2.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/token/example2.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/token/example2.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <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: <ww:property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <ww:property value="#session.balanceDestination"/>
+    <br/>Balance of source account: <saf:property value="#session.balanceSource"/>
+    <br/>Balance of destination account: <saf:property value="#session.balanceDestination"/>
     <p/>
 
-    <ww:form action="transfer2">
-        <ww:token/>
-        <ww:textfield label="Amount" name="amount" required="true" value="200"/>
-        <ww:submit value="Transfer money"/>
-    </ww:form>
+    <saf:form action="transfer2">
+        <saf:token/>
+        <saf:textfield label="Amount" name="amount" required="true" value="200"/>
+        <saf:submit value="Transfer money"/>
+    </saf:form>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/token/example3.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/token/example3.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/token/example3.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/token/example3.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <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: <ww:property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <ww:property value="#session.balanceDestination"/>
+    <br/>Balance of source account: <saf:property value="#session.balanceSource"/>
+    <br/>Balance of destination account: <saf:property value="#session.balanceDestination"/>
     <p/>
 
-    <ww:form action="transfer3">
-        <ww:token/>
-        <ww:textfield label="Amount" name="amount" required="true" value="300"/>
-        <ww:submit value="Transfer money"/>
-    </ww:form>
+    <saf:form action="transfer3">
+        <saf:token/>
+        <saf:textfield label="Amount" name="amount" required="true" value="300"/>
+        <saf:submit value="Transfer money"/>
+    </saf:form>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/token/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/token/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/token/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/token/index.jsp Sun Apr  9 07:28:31 2006
@@ -1,11 +1,11 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Token Examples (double post)</title></head>
 
 <body>
     <h1>Token Examples</h1>
 
-    These examples illustrate WebWorks build in support of using tokens to prevent double post.
+    These examples illustrate Struts build in support of using tokens to prevent double post.
     <p/>
     You have a web page where user can input data and press a button to submit.
     There could be a problem that the user submit the data many times, by either clicking the

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/token/transferDone.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/token/transferDone.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/token/transferDone.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/token/transferDone.jsp Sun Apr  9 07:28:31 2006
@@ -1,25 +1,25 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Token Examples (double post)</title></head>
 
 <body>
     <h1>Token Examples</h1>
 
-    The transfer is done at <ww:text name="token.transfer.time"><ww:param value="#session.time"/></ww:text>
+    The transfer is done at <saf:text name="token.transfer.time"><saf:param value="#session.time"/></saf:text>
 
-    <br/>New balance of source account: <ww:property value="#session.balanceSource"/>
-    <br/>New balance of destination account: <ww:property value="#session.balanceDestination"/>
+    <br/>New balance of source account: <saf:property value="#session.balanceSource"/>
+    <br/>New balance of destination account: <saf:property value="#session.balanceDestination"/>
 
     <p/>
     Try using the browser back button and submit the form again. This should result in a double post
-    that WebWork should intercept and handle accordingly.
+    that Struts should intercept and handle accordingly.
     <p/>
     For example 3 (session token) you should notice that the date/time stays the same. This interceptor
     catches that this is a double post but doens't display the double post page, but just renders the
     web page result from the first post. 
 
     <p/>
-    Click here to <ww:url id="back" value="/token"/><ww:a href="%{back}">return</ww:a>.
+    Click here to <saf:url id="back" value="/token"/><saf:a href="%{back}">return</saf:a>.
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp Sun Apr  9 07:28:31 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="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 	<head>
 		<title>Showcase - Validation - Field Validators Example</title>
-		<ww:url id="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
-		<ww:head />
-		<!--  link rel="stylesheet" type="text/css" href='<ww:property value="%{siteCss}" />'-->
+		<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>
-		<ww:fielderror />
+		<saf:fielderror />
 		<hr/>
 
 		<h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
-		<ww:fielderror>
-			<ww:param value="%{'requiredStringValidatorField'}" />
-		</ww:fielderror>
+		<saf:fielderror>
+			<saf:param value="%{'requiredStringValidatorField'}" />
+		</saf:fielderror>
 		<hr/>
 
 		<h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
-		<ww:fielderror>
-			<ww:param>stringLengthValidatorField</ww:param>
-		</ww:fielderror>
+		<saf:fielderror>
+			<saf:param>stringLengthValidatorField</saf:param>
+		</saf:fielderror>
 		<hr/>
 
-		<ww:form action="submitClientSideValidationExample" namespace="/validation" method="POST" validate="true">
-			<ww:textfield label="Required Validator Field" name="requiredValidatorField" />
-			<ww:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
-			<ww:textfield label="Integer Validator Field" name="integerValidatorField" />
-			<ww:textfield label="Date Validator Field" name="dateValidatorField" />
-			<ww:textfield label="Email Validator Field" name="emailValidatorField" />
-            <ww:textfield label="URL Validator Field" name="urlValidatorField" />
-            <ww:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
-			<ww:textfield label="Regex Validator Field" name="regexValidatorField"/>
-			<ww:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
-			<ww:submit label="Submit" />
-		</ww:form>
+		<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>
 
     <!-- END SNIPPET: fieldValidatorsExample -->
 
 
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 	</body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp Sun Apr  9 07:28:31 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="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 	<head>
 		<title>Showcase - Validation - Field Validators Example</title>
-		<ww:url id="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
-		<ww:head theme="xhtml"/>
-		<!--  link rel="stylesheet" type="text/css" href='<ww:property value="%{siteCss}" />'-->
+		<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>
-		<ww:fielderror />
+		<saf:fielderror />
 		<hr/>
 		
 		<h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
-		<ww:fielderror>
-			<ww:param value="%{'requiredStringValidatorField'}" />
-		</ww:fielderror>
+		<saf:fielderror>
+			<saf:param value="%{'requiredStringValidatorField'}" />
+		</saf:fielderror>
 		<hr/>
 		
 		<h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
-		<ww:fielderror>
-			<ww:param>stringLengthValidatorField</ww:param>
-		</ww:fielderror>
+		<saf:fielderror>
+			<saf:param>stringLengthValidatorField</saf:param>
+		</saf:fielderror>
 		<hr/>
 	
-		<ww:form action="submitFieldValidatorsExamples" namespace="/validation" method="POST" theme="xhtml">
-			<ww:textfield label="Required Validator Field" name="requiredValidatorField" />
-			<ww:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
-			<ww:textfield label="Integer Validator Field" name="integerValidatorField" />
-			<ww:textfield label="Date Validator Field" name="dateValidatorField" />
-			<ww:textfield label="Email Validator Field" name="emailValidatorField" />
-			<ww:textfield label="URL Validator Field" name="urlValidatorField" />
-			<ww:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
-			<ww:textfield label="Regex Validator Field" name="regexValidatorField"/>
-			<ww:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
-			<ww:submit label="Submit" />
-		</ww:form>
+		<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>
 		
     <!-- END SNIPPET: fieldValidatorsExample -->
 		
 		
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 	</body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/footer.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/footer.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/footer.jsp Sun Apr  9 07:28:31 2006
@@ -1,9 +1,9 @@
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <hr/>
 
-<ww:url id="backToValidationExamples" action="list" namespace="/validation" />
-<ww:url id="backToShowCase" action="showcase" namespace="/" />
+<saf:url id="backToValidationExamples" action="list" namespace="/validation" />
+<saf:url id="backToShowCase" action="showcase" namespace="/" />
 		
-<ww:a href="%{backToValidationExamples}">Back To Validation Examples</ww:a>&nbsp;
-<ww:a href="%{backToShowCase}">Back To Showcase</ww:a>
+<saf:a href="%{backToValidationExamples}">Back To Validation Examples</saf:a>&nbsp;
+<saf:a href="%{backToShowCase}">Back To Showcase</saf:a>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/index.jsp Sun Apr  9 07:28:31 2006
@@ -5,7 +5,7 @@
 	@version $Date: 2006/01/13 16:23:44 $ $Id: index.jsp,v 1.4 2006/01/13 16:23:44 rainerh Exp $
 --%>
 
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 	<head>
@@ -14,26 +14,26 @@
 	<body>
 		<h1>Validation Examples</h1>
 		
-		<ww:url id="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
-        <ww:url id="quizClient" namespace="/validation" action="quizClient" method="input"/>
-        <ww:url id="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
-		<ww:url id="quizAjax" namespace="/validation" action="quizAjax" method="input"/>
-		<ww:url id="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation" />
-		<ww:url id="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation" />
-		<ww:url id="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation" />
-		<ww:url id="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation" />
-		<ww:url id="backToShowcase" action="showcase" namespace="/" />
+		<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><ww:a href="%{quizBasic}">Validation (basic)</ww:a></li>
-            <li><ww:a href="%{quizClient}">Validation (client)</ww:a></li>
-            <li><ww:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</ww:a></li>
-        	<li><ww:a href="%{quizAjax}">Validation (ajax)</ww:a></li>
-			<li><ww:a href="%{fieldValidatorUrl}">Field Validators</ww:a></li>
-			<li><ww:a href="%{nonFieldValidatorUrl}">Non Field Validator</ww:a></li>
-			<li><ww:a href="%{visitorValidatorUrl}">Visitor Validator</ww:a></li>
-			<li><ww:a href="%{clientSideValidationUrl}">Client side validation using JavaScript</ww:a></li>
-			<li><ww:a href="%{backToShowcase}">Back To Showcase</ww:a>
+			<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>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp Sun Apr  9 07:28:31 2006
@@ -6,33 +6,33 @@
 --%>
 
 
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 	<head>
 		<title>Showcase - Validation - Non Field Validator Example</title>
-		<ww:url id="siteCss" value="/validation/validationExamplesStyles.css" includeContext="true" />
-		<ww:head />
-		<!-- link rel="stylesheet" type="text/css" href='<ww:property value="%{siteCss}" />'-->
+		<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 -->
-		<ww:actionerror />
+		<saf:actionerror />
 	
-		<ww:form method="POST" action="submitNonFieldValidatorsExamples" namespace="/validation">
-			<ww:textfield name="someText" label="Some Text" />
-			<ww:textfield name="someTextRetype" label="Retype Some Text" />  
-			<ww:textfield name="someTextRetypeAgain" label="Retype Some Text Again" />
-			<ww:submit label="Submit" />
-		</ww:form>
+		<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 -->
 		
 		
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 	</body>
 </html>
 

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp Sun Apr  9 07:28:31 2006
@@ -1,21 +1,21 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 
 <!-- START SNIPPET: ajaxValidation -->
 
 <html>
 <head>
     <title>Validation - Basic</title>
-    <ww:head theme="ajax"/>
+    <saf:head theme="ajax"/>
 </head>
 
 <body>
 
-<ww:form method="post" validate="true" theme="ajax">
-    <ww:textfield label="Name" name="name"/>
-    <ww:textfield label="Age" name="age"/>
-    <ww:textfield label="Favorite color" name="answer"/>
-    <ww:submit/>
-</ww:form>
+<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp Sun Apr  9 07:28:31 2006
@@ -1,11 +1,11 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 
 <!-- START SNIPPET: basicValidation -->
 
 <html>
 <head>
     <title>Validation - Basic</title>
-    <ww:head/>
+    <saf:head/>
 </head>
 
 <body>
@@ -13,12 +13,12 @@
 <b>What is your favorite color?</b>
 <p/>
 
-<ww:form method="post">
-    <ww:textfield label="Name" name="name"/>
-    <ww:textfield label="Age" name="age"/>
-    <ww:textfield label="Favorite color" name="answer"/>
-    <ww:submit/>
-</ww:form>
+<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp Sun Apr  9 07:28:31 2006
@@ -1,21 +1,21 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 
 <!-- START SNIPPET: clientCssValidation -->
 
 <html>
 <head>
     <title>Validation - Basic</title>
-    <ww:head theme="css_xhtml"/>
+    <saf:head theme="css_xhtml"/>
 </head>
 
 <body>
 
-<ww:form method="post" theme="css_xhtml" validate="true">
-    <ww:textfield label="Name" name="name"/>
-    <ww:textfield label="Age" name="age"/>
-    <ww:textfield label="Favorite color" name="answer"/>
-    <ww:submit/>
-</ww:form>
+<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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client.jsp Sun Apr  9 07:28:31 2006
@@ -1,21 +1,21 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 
 <!-- START SNIPPET: clientValidation -->
 
 <html>
 <head>
     <title>Validation - Basic</title>
-    <ww:head/>
+    <saf:head/>
 </head>
 
 <body>
 
-<ww:form method="post" validate="true">
-    <ww:textfield label="Name" name="name"/>
-    <ww:textfield label="Age" name="age"/>
-    <ww:textfield label="Favorite color" name="answer"/>
-    <ww:submit/>
-</ww:form>
+<saf:form method="post" 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>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-success.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-success.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-success.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-success.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
 <head>
     <title>Quiz submitted!</title>
@@ -6,9 +6,9 @@
 
 <body>
 
-Thank you, <b><ww:property value="name"/></b>. Your answer has been submitted as:
+Thank you, <b><saf:property value="name"/></b>. Your answer has been submitted as:
 
-<b><ww:property value="answer"/></b>
+<b><saf:property value="answer"/></b>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp Sun Apr  9 07:28:31 2006
@@ -5,7 +5,7 @@
 	@version $Date: 2006/01/13 16:23:45 $ $Id: successClientSideValidationExample.jsp,v 1.1 2006/01/13 16:23:45 rainerh Exp $
 --%>
 
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 	<head><title>Showcase - Validation - SuccessFieldValidatorsExample</title></head>
@@ -14,39 +14,40 @@
 		<table>
 			<tr>
 				<td>Required Validator Field:</td>
-				<td><ww:property value="requiredValidatorField" /></td>
+				<td><saf:property value="requiredValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Required String Validator Field:</td>
-				<td><ww:property value="requiredStringValidatorField" /></td>
+				<td><saf:property value="requiredStringValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Integer Validator Field: </td>
-				<td><ww:property value="integerValidatorField" /></td>
+				<td><saf:property value="integerValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Date Validator Field: </td>
-				<td><ww:property value="dateValidatorField" /></td>
+				<td><saf:property value="dateValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Email Validator Field: </td>
-				<td><ww:property value="emailValidatorField" /></td>
+				<td><saf:property value="emailValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>URL Validator Field: </td>
-				<td><ww:property value="urlValidatorField" /></td>
+				<td><saf:property value="urlValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>String Length Validator Field: </td>
-				<td><ww:property value="stringLengthValidatorField" /></td>
+				<td><saf:property value="stringLengthValidatorField" /></td>
 			</tr>
 			<tr>
-				<td>Regex Validator Field: <ww:property value="regexValidatorField" /></td>
-				<td>Field Expression Validator Field: <ww:property value="fieldExpressionValidatorField" /></td>
+				<td>Regex Validator Field: <saf:property value="regexValidatorField" /></td>
+				<td>Field Expression Validator Field: <saf:property value="fieldExpressionValidatorField" /></td>
 			</tr>
 		</table>
 
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 	</body>
+	
 </html>
 

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp Sun Apr  9 07:28:31 2006
@@ -5,7 +5,7 @@
 	@version $Date: 2005/12/22 09:17:59 $ $Id: successFieldValidatorsExample.jsp,v 1.1 2005/12/22 09:17:59 tmjee Exp $
 --%>
 
-<%@taglib prefix="ww" uri="/webwork" %>
+<%@taglib prefix="saf" uri="/struts-action" %>
 
 <html>
 	<head><title>Showcase - Validation - SuccessFieldValidatorsExample</title></head>
@@ -14,35 +14,35 @@
 		<table>
 			<tr>
 				<td>Required Validator Field:</td>
-				<td><ww:property value="requiredValidatorField" /></td>
+				<td><saf:property value="requiredValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Required String Validator Field:</td>
-				<td><ww:property value="requiredStringValidatorField" /></td>
+				<td><saf:property value="requiredStringValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Integer Validator Field: </td>
-				<td><ww:property value="integerValidatorField" /></td>
+				<td><saf:property value="integerValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Date Validator Field: </td>
-				<td><ww:property value="dateValidatorField" /></td>
+				<td><saf:property value="dateValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>Email Validator Field: </td>
-				<td><ww:property value="emailValidatorField" /></td>
+				<td><saf:property value="emailValidatorField" /></td>
 			</tr>
 			<tr>
 				<td>String Length Validator Field: </td>
-				<td><ww:property value="stringLengthValidatorField" /></td>
+				<td><saf:property value="stringLengthValidatorField" /></td>
 			</tr>
 			<tr>
-				<td>Regex Validator Field: <ww:property value="regexValidatorField" /></td>
-				<td>Field Expression Validator Field: <ww:property value="fieldExpressionValidatorField" /></td>
+				<td>Regex Validator Field: <saf:property value="regexValidatorField" /></td>
+				<td>Field Expression Validator Field: <saf:property value="fieldExpressionValidatorField" /></td>
 			</tr>
 		</table>
 		
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 	</body>
 </html>
 

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp Sun Apr  9 07:28:31 2006
@@ -6,7 +6,7 @@
 --%>
 
 
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 	<head><title>Showcase - Validation - SuccessNonFieldValidatorsExample</title></head>
@@ -15,19 +15,19 @@
 		<table>
 			<tr>
 				<td>Some Text: </td>
-				<td><ww:property value="someText" /></td>
+				<td><saf:property value="someText" /></td>
 			</tr>
 			<tr>
 				<td>Some Text Retyped: </td>
-				<td><ww:property value="someTextRetype" /></td>
+				<td><saf:property value="someTextRetype" /></td>
 			</tr>
 			<tr>
 				<td>Some Text Retyped Again: </td>
-				<td><ww:property value="someTextRetypeAgain" /></td>
+				<td><saf:property value="someTextRetypeAgain" /></td>
 			</tr>
 		</table>
 		
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 	</body>
 </html>
 

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp Sun Apr  9 07:28:31 2006
@@ -7,7 +7,7 @@
 
 
 
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 	<head><title>Showcase - Validation - SuccessVisitorValidatorsExameple</title></head>
@@ -16,19 +16,19 @@
 		<table>
 			<tr>
 				<td>User Name:</td>
-				<td><ww:property value="user.name" /></td>
+				<td><saf:property value="user.name" /></td>
 			</tr>
 			<tr>
 				<td>User Age:</td>			
-				<td><ww:property value="user.age" /></td>
+				<td><saf:property value="user.age" /></td>
 			</tr>
 			<tr>
 				<td>User Birthday:</td>
-				<td><ww:property value="user.birthday" /></td>
+				<td><saf:property value="user.birthday" /></td>
 			</tr>
 		</table>
 		
-		<ww:include value="footer.jsp" />
+		<saf:include value="footer.jsp" />
 		
 	</body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp Sun Apr  9 07:28:31 2006
@@ -6,31 +6,31 @@
 --%>
 
 
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
 
 <html>
 <head><title>Showcase - Validation - VisitorValidatorsExample </title>
-		<ww:url id="siteCss" value="/validation/validationExamplesStyles.css" includeContext="true" />
-		<ww:head />
-		<!-- link rel="stylesheet" type="text/css" href='<ww:property value="%{siteCss}" />' -->
+		<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: visitorValidatorsExample -->
 	
-	<ww:fielderror />
+	<saf:fielderror />
 
-	<ww:form method="POST" action="submitVisitorValidatorsExamples" namespace="/validation">
-		<ww:textfield name="user.name" label="User Name" />
-		<ww:textfield name="user.age" label="User Age" />
-		<ww:textfield name="user.birthday" label="Birthday" />
-		<ww:submit label="Submit" />
-	</ww:form>
+	<saf:form method="POST" action="submitVisitorValidatorsExamples" namespace="/validation">
+		<saf:textfield name="user.name" label="User Name" />
+		<saf:textfield name="user.age" label="User Age" />
+		<saf:textfield name="user.birthday" label="Birthday" />
+		<saf:submit label="Submit" />
+	</saf:form>
 	
 	<!--  END SNIPPET: visitorValidatorsExample -->
 	
 	
-	<ww:include value="footer.jsp" />
+	<saf:include value="footer.jsp" />
 </body>
 </html>
 

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/wait/complete.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/wait/complete.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/wait/complete.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/wait/complete.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Execute and Wait Examples</title></head>
 
@@ -7,7 +7,7 @@
 
     <b>We have processed your request.</b>
     <p/>
-    Click here to <ww:url id="back" value="/wait"/><ww:a href="%{back}">return</ww:a>.
+    Click here to <saf:url id="back" value="/wait"/><saf:a href="%{back}">return</saf:a>.
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/wait/example1.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/wait/example1.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/wait/example1.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/wait/example1.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Execute and Wait Examples</title></head>
 
@@ -7,10 +7,10 @@
     
     <b>Example 1:</b> In the form below enter how long time to simulate the process should take.
 
-    <ww:form action="longProcess1">
-        <ww:textfield label="Time (millis)" name="time" required="true" value="7000"/>
-        <ww:submit value="submit"/>
-    </ww:form>
+    <saf:form action="longProcess1">
+        <saf:textfield label="Time (millis)" name="time" required="true" value="7000"/>
+        <saf:submit value="submit"/>
+    </saf:form>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/wait/example2.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/wait/example2.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/wait/example2.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/wait/example2.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Execute and Wait Examples</title></head>
 
@@ -8,10 +8,10 @@
     <b>Example 2:</b> As example 1 but uses a delay of 2000 millis before the wait page is shown. Try simulating with
     a value of 500 millis to see that no wait page is shown at all.
 
-    <ww:form action="longProcess2">
-        <ww:textfield label="Time (millis)" name="time" required="true" value="8000"/>
-        <ww:submit value="submit"/>
-    </ww:form>
+    <saf:form action="longProcess2">
+        <saf:textfield label="Time (millis)" name="time" required="true" value="8000"/>
+        <saf:submit value="submit"/>
+    </saf:form>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/wait/example3.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/wait/example3.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/wait/example3.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/wait/example3.jsp Sun Apr  9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Execute and Wait Examples</title></head>
 
@@ -9,10 +9,10 @@
     While waiting for the wait page it will check every 1000 millis if the background process is already
     done. Try simulating with a value of 700 millis to see that the wait page is shown soon thereafter.
 
-    <ww:form action="longProcess3">
-        <ww:textfield label="Time (millis)" name="time" required="true" value="9000"/>
-        <ww:submit value="submit"/>
-    </ww:form>
+    <saf:form action="longProcess3">
+        <saf:textfield label="Time (millis)" name="time" required="true" value="9000"/>
+        <saf:submit value="submit"/>
+    </saf:form>
 
 </body>
 </html>

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/wait/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/wait/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/wait/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/wait/index.jsp Sun Apr  9 07:28:31 2006
@@ -1,11 +1,11 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
     <head><title>Execute and Wait Examples</title></head>
 
 <body>
     <h1>Execute and Wait Examples</h1>
 
-    These examples illustrate WebWorks build in support for execute and wait.
+    These examples illustrate Struts build in support for execute and wait.
     <p/>
     When you have a process that takes a long time your users can be impatient and starts to submit/click again.
     <br/> A good solution is to show the user a progress page (wait page) while the process takes it time.

Modified: incubator/webwork2/webapps/showcase/src/main/webapp/wait/wait.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/wait/wait.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/wait/wait.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/wait/wait.jsp Sun Apr  9 07:28:31 2006
@@ -1,7 +1,7 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
 <html>
 <head>
-    <meta http-equiv="refresh" content="5;url=<ww:url includeParams="all"/>"/>
+    <meta http-equiv="refresh" content="5;url=<saf:url includeParams="all"/>"/>
 </head>
 
 <body>
@@ -10,7 +10,7 @@
     </p>
 
     <p/>
-    You can click this link to <a href="<ww:url includeParams="all"/>">refresh</a>.
+    You can click this link to <a href="<saf:url includeParams="all"/>">refresh</a>.
 
 </body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org