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 [1/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...
Author: tmjee
Date: Sun Apr 9 07:28:31 2006
New Revision: 392735
URL: http://svn.apache.org/viewcvs?rev=392735&view=rev
Log:
changed jsp tag uri from /webwork to /struts-action and prefix from ww
to saf
Modified:
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/footer.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/date.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/filedownload/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload-success.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/help.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/person/editPeople.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/showcase.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/example.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/token/doublePost.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/token/example1.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/token/example2.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/token/example3.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/token/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/token/transferDone.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/footer.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-client.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/quiz-success.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/wait/complete.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/wait/example1.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/wait/example2.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/wait/example3.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/wait/index.jsp
incubator/webwork2/webapps/showcase/src/main/webapp/wait/wait.jsp
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml Sun Apr 9 07:28:31 2006
@@ -8,7 +8,7 @@
<pattern>/scripts/*</pattern>
<pattern>/images/*</pattern>
<pattern>/dojo/*</pattern>
- <pattern>/webwork/*</pattern>
+ <pattern>/struts/*</pattern>
<pattern>/ajax/AjaxResult*</pattern>
<pattern>/AjaxTest.action</pattern>
<pattern>/ajax/remoteforms/AjaxRemoteForm.action</pattern>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp Sun Apr 9 07:28:31 2006
@@ -9,16 +9,16 @@
<%@ taglib uri="sitemesh-decorator" prefix="decorator" %>
<%@ taglib uri="sitemesh-page" prefix="page" %>
-<%@ taglib prefix="ww" uri="/struts-action" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title><decorator:title default="Struts Action Showcase"/></title>
- <link href="<ww:url value='/styles/main.css'/>" rel="stylesheet" type="text/css" media="all"/>
- <link href="<ww:url value='/struts/niftycorners/niftyCorners.css'/>" rel="stylesheet" type="text/css"/>
- <link href="<ww:url value='/struts/niftycorners/niftyPrint.css'/>" rel="stylesheet" type="text/css" media="print"/>
+ <link href="<saf:url value='/styles/main.css'/>" rel="stylesheet" type="text/css" media="all"/>
+ <link href="<saf:url value='/struts/niftycorners/niftyCorners.css'/>" rel="stylesheet" type="text/css"/>
+ <link href="<saf:url value='/struts/niftycorners/niftyPrint.css'/>" rel="stylesheet" type="text/css" media="print"/>
- <script language="JavaScript" type="text/javascript" src="<ww:url value='/struts/niftycorners/nifty.js'/>"></script>
+ <script language="JavaScript" type="text/javascript" src="<saf:url value='/struts/niftycorners/nifty.js'/>"></script>
<script language="JavaScript" type="text/javascript">
@@ -43,11 +43,11 @@
<div id="header" class="clearfix">
<div id="branding">
<h1 class="title">Struts Action Showcase</h1>
- <ww:action id="dateAction" name="date" namespace="/" executeResult="true" />
+ <saf:action id="dateAction" name="date" namespace="/" executeResult="true" />
</div><!-- end branding -->
<div id="search">
- <img src="<ww:url value='/images/logo-small.png'/>" alt="Struts logo"/>
+ <img src="<saf:url value='/images/logo-small.png'/>" alt="Struts logo"/>
</div><!-- end search -->
<hr/>
@@ -62,20 +62,20 @@
<div class="wrapper">
<h2 class="accessibility">Navigation</h2>
<ul class="clearfix">
- <li><strong><a href="<ww:url action="showcase" namespace="/" includeParams="none" />">Home</a></strong></li>
- <li><a href="<ww:url action="index" namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
- <li><a href="<ww:url action="guess" namespace="/continuations" />">Continuations</a></li>
- <li><a href="<ww:url value="/tags/index.jsp"/>">Tags</a></li>
- <li><a href="<ww:url action="upload" namespace="/fileupload" includeParams="none"/>">File Upload</a></li>
- <li><a href="<ww:url value="/empmanager/index.jsp"/>">CRUD</a></li>
- <li><a href="<ww:url value="/person/index.jsp"/>">Person Manager</a></li>
- <li><a href="<ww:url value="/validation/index.jsp"/>">Validation</a></li>
- <li><a href="<ww:url value="/ajax/index.jsp"/>">AJAX</a></li>
- <li><a href="<ww:url action="actionChain1!input" namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
- <li><a href="<ww:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
- <li><a href="<ww:url value="/token/index.jsp"/>">Token</a></li>
- <li><a href="<ww:url value="/filedownload/index.jsp"/>">File Download</a></li>
- <li class="last"><a href="<ww:url value="/help.jsp"/>">Help</a></li>
+ <li><strong><a href="<saf:url action="showcase" namespace="/" includeParams="none" />">Home</a></strong></li>
+ <li><a href="<saf:url action="index" namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
+ <li><a href="<saf:url action="guess" namespace="/continuations" />">Continuations</a></li>
+ <li><a href="<saf:url value="/tags/index.jsp"/>">Tags</a></li>
+ <li><a href="<saf:url action="upload" namespace="/fileupload" includeParams="none"/>">File Upload</a></li>
+ <li><a href="<saf:url value="/empmanager/index.jsp"/>">CRUD</a></li>
+ <li><a href="<saf:url value="/person/index.jsp"/>">Person Manager</a></li>
+ <li><a href="<saf:url value="/validation/index.jsp"/>">Validation</a></li>
+ <li><a href="<saf:url value="/ajax/index.jsp"/>">AJAX</a></li>
+ <li><a href="<saf:url action="actionChain1!input" namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
+ <li><a href="<saf:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
+ <li><a href="<saf:url value="/token/index.jsp"/>">Token</a></li>
+ <li><a href="<saf:url value="/filedownload/index.jsp"/>">File Download</a></li>
+ <li class="last"><a href="<saf:url value="/help.jsp"/>">Help</a></li>
</ul>
</div>
<hr/>
@@ -86,7 +86,7 @@
<div id="footer" class="clearfix">
- <p>© Copyright 2003-<ww:property value="#dateAction.now.year + 1900" /> OpenSymphony</p>
+ <p>© Copyright 2003-<saf:property value="#dateAction.now.year + 1900" /> OpenSymphony</p>
</div><!-- end footer -->
<p/>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.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,9 +6,9 @@
</head>
<body>
<h1>Action Chaining Result:</h1>
- <ww:label label="Action Chain 1 Property 1" name="actionChain1Property1" /><br/>
- <ww:label label="Action Chain 2 Property 1" name="actionChain2Property1" /><br/>
- <ww:label label="Action Chain 3 Property 1" name="actionChain3Property1" /><br/>
+ <saf:label label="Action Chain 1 Property 1" name="actionChain1Property1" /><br/>
+ <saf:label label="Action Chain 2 Property 1" name="actionChain2Property1" /><br/>
+ <saf:label label="Action Chain 3 Property 1" name="actionChain3Property1" /><br/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp Sun Apr 9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<%
response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
@@ -6,4 +6,4 @@
response.setDateHeader ("Expires", 0); //prevents caching at the proxy server
%>
-Result: <ww:property value="count"/> @ <ww:property value="serverTime"/>
+Result: <saf:property value="count"/> @ <saf:property value="serverTime"/>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp Sun Apr 9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<%
response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
@@ -6,6 +6,6 @@
response.setDateHeader ("Expires", 0); //prevents caching at the proxy server
%>
-Result: <ww:property value="count"/> @ <ww:property value="serverTime"/>
+Result: <saf:property value="count"/> @ <saf:property value="serverTime"/>
-The value you entered was: <ww:property value="data"/><br/>
+The value you entered was: <saf:property value="data"/><br/>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp Sun Apr 9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<!--// START SNIPPET: common-include-->
-<ww:head theme="ajax"/>
+<saf:head theme="ajax"/>
<!--// END SNIPPET: common-include-->
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/footer.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/footer.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/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="backToAjaxExamples" value=".." />
-<ww:url id="backToShowCase" action="showcase" namespace="/" />
+<saf:url id="backToAjaxExamples" value=".." />
+<saf:url id="backToShowCase" action="showcase" namespace="/" />
-<ww:a href="%{backToAjaxExamples}">Back To AJAX Examples</ww:a>
-<ww:a href="%{backToShowCase}">Back To Showcase</ww:a>
+<saf:a href="%{backToAjaxExamples}">Back To AJAX Examples</saf:a>
+<saf:a href="%{backToShowCase}">Back To Showcase</saf:a>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -9,16 +9,16 @@
<body>
-<ww:div
+<saf:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
delay="5000"
loadingText="loading...">
- Initial Content</ww:div>
+ Initial Content</saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -8,7 +8,7 @@
</head>
<body>
- <ww:div
+ <saf:div
id="twoseconds"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
@@ -16,9 +16,9 @@
updateFreq="2000"
errorText="There was an error"
loadingText="loading...">Initial Content
- </ww:div>
+ </saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -9,16 +9,16 @@
<body>
-<ww:div
+<saf:div
id="twoseconds"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
theme="ajax"
delay="2000"
updateFreq="%{#parameters.period}"
- errorText="There was an error">Initial Content</ww:div>
+ errorText="There was an error">Initial Content</saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -9,7 +9,7 @@
<body>
-<ww:div
+<saf:div
id="fiveseconds"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
@@ -17,9 +17,9 @@
delay="1000"
updateFreq="5000"
errorText="There was an error"
- loadingText="reloading">loading now</ww:div>
+ loadingText="reloading">loading now</saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -9,16 +9,16 @@
<body>
-<ww:div
+<saf:div
id="error"
cssStyle="border: 1px solid yellow;"
href="/AjaxNoUrl.jsp"
theme="ajax"
delay="1000"
errorText="Could not contact server"
- loadingText="reloading">loading now</ww:div>
+ loadingText="reloading">loading now</saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -9,16 +9,16 @@
<body>
-<ww:div
+<saf:div
id="error"
cssStyle="border: 1px solid yellow;"
href="/AjaxNoUrl.jsp"
theme="ajax"
delay="1000"
showErrorTransportText="true"
- loadingText="reloading">loading now</ww:div>
+ loadingText="reloading">loading now</saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -9,16 +9,16 @@
<body>
-<ww:div
+<saf:div
id="error"
cssStyle="border: 1px solid yellow;"
href="/Test3.action"
theme="ajax"
delay="1000"
showErrorTransportText="true"
- loadingText="reloading">loading now</ww:div>
+ loadingText="reloading">loading now</saf:div>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotediv/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>
<title>AJAX-based remote DIV tag</title>
@@ -46,7 +46,7 @@
</p>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -21,91 +21,91 @@
Remote form replacing another div:<br/>
<div id='two' style="border: 1px solid yellow;"><b>initial content</b></div>
-<ww:form
+<saf:form
id='theForm2'
cssStyle="border: 1px solid green;"
action='AjaxRemoteForm'
method='post'
theme="ajax">
- <input type='text' name='data' value='WebWork User'>
+ <input type='text' name='data' value='Struts User'>
- <ww:submit value="GO2" theme="ajax" resultDivId="two"/>
+ <saf:submit value="GO2" theme="ajax" resultDivId="two"/>
-</ww:form>
+</saf:form>
Remote form replacing the forms content:<br/>
-<ww:form
+<saf:form
id='theForm3'
cssStyle="border: 1px solid green;"
action='AjaxRemoteForm'
method='post'
theme="ajax">
- <input type='text' name='data' value='WebWork User'>
+ <input type='text' name='data' value='Struts User'>
- <ww:submit value="GO3" theme="ajax" resultDivId="theForm3"/>
+ <saf:submit value="GO3" theme="ajax" resultDivId="theForm3"/>
-</ww:form>
+</saf:form>
Remote form evaluating suplied JS on completion:<br/>
-<ww:form
+<saf:form
id='theForm4'
cssStyle="border: 1px solid green;"
action='AjaxRemoteForm'
method='post'
theme="ajax">
- <input type='text' name='data' value='WebWork User'>
+ <input type='text' name='data' value='Struts User'>
- <ww:submit value="GO4" theme="ajax" onLoadJS="alert('form submitted');"/>
+ <saf:submit value="GO4" theme="ajax" onLoadJS="alert('form submitted');"/>
-</ww:form>
+</saf:form>
Remote form replacing the forms content after confirming results:<br/>
-<ww:form
+<saf:form
id='theForm5'
cssStyle="border: 1px solid green;"
action='AjaxRemoteForm'
method='post'
theme="ajax">
- <input type='text' name='data' value='WebWork User'>
+ <input type='text' name='data' value='Struts User'>
- <ww:submit value="GO3" theme="ajax" resultDivId="theForm5" preInvokeJS="confirm('sure?');"/>
+ <saf:submit value="GO3" theme="ajax" resultDivId="theForm5" preInvokeJS="confirm('sure?');"/>
-</ww:form>
+</saf:form>
Remote form replacing the forms content after running a function:<br/>
-<ww:form
+<saf:form
id='theForm6'
cssStyle="border: 1px solid green;"
action='AjaxRemoteForm'
method='post'
theme="ajax">
- <input type='text' name='data' value='WebWork User'>
+ <input type='text' name='data' value='Struts User'>
- <ww:submit value="GO3" theme="ajax" resultDivId="theForm6" preInvokeJS="doSomething();"/>
+ <saf:submit value="GO3" theme="ajax" resultDivId="theForm6" preInvokeJS="doSomething();"/>
-</ww:form>
+</saf:form>
A form with no remote submit (so should not be ajaxified):<br/>
-<ww:form
+<saf:form
id='theForm7'
cssStyle="border: 1px solid green;"
action='AjaxRemoteForm'
method='post'
theme="ajax">
- <input type='text' name='data' value='WebWork User'>
+ <input type='text' name='data' value='Struts User'>
- <ww:submit value="Go AWAY" resultDivId="theForm7" />
+ <saf:submit value="Go AWAY" resultDivId="theForm7" />
-</ww:form>
+</saf:form>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp Sun Apr 9 07:28:31 2006
@@ -1,18 +1,18 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
-<ww:head theme="ajax"/>
+<saf:head theme="ajax"/>
</head>
<body>
-<ww:form name="test1" id="test1" action="/ajax/Test1.action" theme="ajax">
+<saf:form name="test1" id="test1" action="/ajax/Test1.action" theme="ajax">
Test 1 Form
-<ww:submit theme="ajax" resultDivId="result2"/>
-</ww:form>
+<saf:submit theme="ajax" resultDivId="result2"/>
+</saf:form>
-<ww:div id="result2" theme="ajax" >test2 - before</ww:div>
+<saf:div id="result2" theme="ajax" >test2 - before</saf:div>
-<ww:div id="result3" theme="ajax">test3 - before</ww:div>
+<saf:div id="result3" theme="ajax">test3 - before</saf:div>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp Sun Apr 9 07:28:31 2006
@@ -1,6 +1,6 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
-<ww:form name="test2" id="test2" action="/ajax/Test2.action" theme="ajax">
+<saf:form name="test2" id="test2" action="/ajax/Test2.action" theme="ajax">
Test 2 form
-<ww:submit theme="ajax" resultDivId="result3"/>
-</ww:form>
+<saf:submit theme="ajax" resultDivId="result3"/>
+</saf:form>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -10,81 +10,81 @@
<body>
One Component:
-<ww:div
+<saf:div
id="one"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
theme="ajax"
listenTopics="mylink1_click"
- delay="1000">Initial Content</ww:div>
+ delay="1000">Initial Content</saf:div>
<br/><br/>
Two Component:
-<ww:div
+<saf:div
id="two"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
theme="ajax"
listenTopics="mylink1_click,mylink2_click"
- delay="1000">Initial Content</ww:div>
+ delay="1000">Initial Content</saf:div>
<br/><br/>
Three Component:
-<ww:div
+<saf:div
id="three"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
theme="ajax"
listenTopics="mylink2_click"
- delay="1000">Initial Content</ww:div>
+ delay="1000">Initial Content</saf:div>
<br/><br/>
-<ww:url id="remoteLink" value ="/AjaxRemoteLink.action" />
-<ww:url id="testLink" value ="/AjaxTest.action" />
+<saf:url id="remoteLink" value ="/AjaxRemoteLink.action" />
+<saf:url id="testLink" value ="/AjaxTest.action" />
Remote link 1 updating "One Component" and "Two Component"<br/>
-<ww:a
+<saf:a
id="link1"
theme="ajax"
href="%{remoteLink}"
notifyTopics="mylink1_click"
showErrorTransportText="true"
- errorText="An Error ocurred">Update</ww:a>
+ errorText="An Error ocurred">Update</saf:a>
<br/><br/>
Remote link 2 updating "Two Component" and "Three Component"<br/>
-<ww:a
+<saf:a
id="link2"
theme="ajax"
href="%{remoteLink}"
notifyTopics="mylink2_click"
showErrorTransportText="true"
- errorText="An Error ocurred">Update</ww:a>
+ errorText="An Error ocurred">Update</saf:a>
<br/><br/>
Remote DIV that is not connected to any remote links:
-<ww:div
+<saf:div
id="four"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
theme="ajax"
- delay="1000">Initial Content</ww:div>
+ delay="1000">Initial Content</saf:div>
<br/><br/>
A Remote link that doesn't trigger any remote DIV updates<br/>
-<ww:a
+<saf:a
id="link3"
theme="ajax"
href="%{remoteLink}"
showErrorTransportText="true"
errorText="An Error ocurred">Update
-</ww:a>
+</saf:a>
<br/><br/>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp Sun Apr 9 07:28:31 2006
@@ -1,15 +1,15 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/tabs.css"/>">
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/niftycorners/niftyCorners.css"/>">
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/niftycorners/niftyPrint.css"/>" media="print">
- <script type="text/javascript" src="<ww:url value="/webwork/niftycorners/nifty.js"/>"></script>
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/tabs.css"/>">
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/niftycorners/niftyCorners.css"/>">
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/niftycorners/niftyPrint.css"/>" media="print">
+ <script type="text/javascript" src="<saf:url value="/struts/niftycorners/nifty.js"/>"></script>
<script type="text/javascript">
dojo.event.connect(window, "onload", function() {
if (!NiftyCheck())
@@ -27,86 +27,86 @@
<table cellpadding="0" cellspacing="10" border="0" width="600">
<tr>
<td align="top">
- <ww:tabbedPanel id="test" >
- <ww:panel id="one" tabName="one">
+ <saf:tabbedPanel id="test" >
+ <saf:panel id="one" tabName="one">
This is the first pane<br/>
- <ww:form>
- <ww:textfield name="tt" label="Test Text"/> <br/>
- <ww:textfield name="tt2" label="Test Text2"/>
- </ww:form>
- </ww:panel>
- <ww:panel id="two" tabName="two">
+ <saf:form>
+ <saf:textfield name="tt" label="Test Text"/> <br/>
+ <saf:textfield name="tt2" label="Test Text2"/>
+ </saf:form>
+ </saf:panel>
+ <saf:panel id="two" tabName="two">
This is the second panel
- </ww:panel>
- <ww:panel id="three" tabName="three">
+ </saf:panel>
+ <saf:panel id="three" tabName="three">
This is the three
- </ww:panel>
- </ww:tabbedPanel>
+ </saf:panel>
+ </saf:tabbedPanel>
</td>
<td align="top">
- <ww:tabbedPanel id="test2" >
- <ww:panel id="left" tabName="left">
+ <saf:tabbedPanel id="test2" >
+ <saf:panel id="left" tabName="left">
This is the left pane<br/>
- <ww:form>
- <ww:textfield name="tt" label="Test Text"/> <br/>
- <ww:textfield name="tt2" label="Test Text2"/>
- </ww:form>
- </ww:panel>
- <ww:panel remote="true" href="/AjaxTest.action" id="ryh1" theme="ajax"
- tabName="remote one"></ww:panel>
- <ww:panel id="middle" tabName="middle">
+ <saf:form>
+ <saf:textfield name="tt" label="Test Text"/> <br/>
+ <saf:textfield name="tt2" label="Test Text2"/>
+ </saf:form>
+ </saf:panel>
+ <saf:panel remote="true" href="/AjaxTest.action" id="ryh1" theme="ajax"
+ tabName="remote one"></saf:panel>
+ <saf:panel id="middle" tabName="middle">
middle tab<br/>
- <ww:form>
- <ww:textfield name="tt" label="Test Text44"/> <br/>
- <ww:textfield name="tt2" label="Test Text442"/>
- </ww:form>
- </ww:panel>
- <ww:panel remote="true" href="/AjaxTest.action" id="ryh21" theme="ajax" tabName="remote right"/>
- </ww:tabbedPanel>
+ <saf:form>
+ <saf:textfield name="tt" label="Test Text44"/> <br/>
+ <saf:textfield name="tt2" label="Test Text442"/>
+ </saf:form>
+ </saf:panel>
+ <saf:panel remote="true" href="/AjaxTest.action" id="ryh21" theme="ajax" tabName="remote right"/>
+ </saf:tabbedPanel>
</td>
</tr>
<tr>
<td align="top">
- <ww:tabbedPanel id="testremote">
- <ww:panel remote="true" href="/AjaxTest.action" id="r1" theme="ajax" tabName="remote one">
- <ww:action name="AjaxTest" executeResult="true" />
- </ww:panel>
- <ww:panel remote="true" href="/AjaxTest.action" id="r2" theme="ajax" tabName="remote two"></ww:panel>
- <ww:panel remote="true" href="/AjaxTest.action" id="r3" theme="ajax" tabName="remote three"></ww:panel>
- </ww:tabbedPanel>
+ <saf:tabbedPanel id="testremote">
+ <saf:panel remote="true" href="/AjaxTest.action" id="r1" theme="ajax" tabName="remote one">
+ <saf:action name="AjaxTest" executeResult="true" />
+ </saf:panel>
+ <saf:panel remote="true" href="/AjaxTest.action" id="r2" theme="ajax" tabName="remote two"></saf:panel>
+ <saf:panel remote="true" href="/AjaxTest.action" id="r3" theme="ajax" tabName="remote three"></saf:panel>
+ </saf:tabbedPanel>
</td>
<td align="top">
- <ww:tabbedPanel id="test3" >
- <ww:panel id="left1" tabName="out one">
+ <saf:tabbedPanel id="test3" >
+ <saf:panel id="left1" tabName="out one">
Outer one<br/>
- <ww:tabbedPanel id="test11">
- <ww:panel id="i11" tabName="inner 1 one">Inner 1</ww:panel>
- <ww:panel id="112" tabName="inner 1 two">Inner 2</ww:panel>
- <ww:panel id="i13" tabName="inner 1 three">Inner 3</ww:panel>
- </ww:tabbedPanel>
- </ww:panel>
- <ww:panel id="middle1" tabName="out two">
+ <saf:tabbedPanel id="test11">
+ <saf:panel id="i11" tabName="inner 1 one">Inner 1</saf:panel>
+ <saf:panel id="112" tabName="inner 1 two">Inner 2</saf:panel>
+ <saf:panel id="i13" tabName="inner 1 three">Inner 3</saf:panel>
+ </saf:tabbedPanel>
+ </saf:panel>
+ <saf:panel id="middle1" tabName="out two">
Outer two<br/>
- <ww:tabbedPanel id="test12" >
- <ww:panel id="i21" tabName="inner 2 one">Inner 21</ww:panel>
- <ww:panel id="122" tabName="inner 2 two">Inner 22</ww:panel>
- <ww:panel id="i23" tabName="inner 2 three">Inner 23</ww:panel>
- </ww:tabbedPanel>
- </ww:panel>
- <ww:panel id="right1" tabName="out three">
+ <saf:tabbedPanel id="test12" >
+ <saf:panel id="i21" tabName="inner 2 one">Inner 21</saf:panel>
+ <saf:panel id="122" tabName="inner 2 two">Inner 22</saf:panel>
+ <saf:panel id="i23" tabName="inner 2 three">Inner 23</saf:panel>
+ </saf:tabbedPanel>
+ </saf:panel>
+ <saf:panel id="right1" tabName="out three">
Outer three<br/>
- <ww:tabbedPanel id="test13">
- <ww:panel id="i31" tabName="inner 3 one">Inner 31</ww:panel>
- <ww:panel id="132" tabName="inner 3 two">Inner 32</ww:panel>
- <ww:panel id="i33" tabName="inner 3 three">Inner 33</ww:panel>
- </ww:tabbedPanel>
- </ww:panel>
- </ww:tabbedPanel>
+ <saf:tabbedPanel id="test13">
+ <saf:panel id="i31" tabName="inner 3 one">Inner 31</saf:panel>
+ <saf:panel id="132" tabName="inner 3 two">Inner 32</saf:panel>
+ <saf:panel id="i33" tabName="inner 3 three">Inner 33</saf:panel>
+ </saf:tabbedPanel>
+ </saf:panel>
+ </saf:tabbedPanel>
</td>
</tr>
</table>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp Sun Apr 9 07:28:31 2006
@@ -1,15 +1,15 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/tabs.css"/>">
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/niftycorners/niftyCorners.css"/>">
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/niftycorners/niftyPrint.css"/>" media="print">
- <script type="text/javascript" src="<ww:url value="/webwork/niftycorners/nifty.js"/>"></script>
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/tabs.css"/>">
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/niftycorners/niftyCorners.css"/>">
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/niftycorners/niftyPrint.css"/>" media="print">
+ <script type="text/javascript" src="<saf:url value="/struts/niftycorners/nifty.js"/>"></script>
<script type="text/javascript">
window.onload = function() {
if (!NiftyCheck())
@@ -27,26 +27,26 @@
<table cellpadding="0" cellspacing="10" border="0" width="600">
<tr>
<td align="top">
- <ww:tabbedPanel id="test" theme="ajax">
- <ww:panel id="one" tabName="one" theme="ajax" >
+ <saf:tabbedPanel id="test" theme="ajax">
+ <saf:panel id="one" tabName="one" theme="ajax" >
This is the first pane<br/>
- <ww:form>
- <ww:textfield name="tt" label="Test Text"/> <br/>
- <ww:textfield name="tt2" label="Test Text2"/>
- </ww:form>
- </ww:panel>
- <ww:panel id="two" tabName="two" theme="ajax">
+ <saf:form>
+ <saf:textfield name="tt" label="Test Text"/> <br/>
+ <saf:textfield name="tt2" label="Test Text2"/>
+ </saf:form>
+ </saf:panel>
+ <saf:panel id="two" tabName="two" theme="ajax">
This is the second panel
- </ww:panel>
- <ww:panel id="three" tabName="three" theme="ajax">
+ </saf:panel>
+ <saf:panel id="three" tabName="three" theme="ajax">
This is the three
- </ww:panel>
- </ww:tabbedPanel>
+ </saf:panel>
+ </saf:tabbedPanel>
</td>
</tr>
</table>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp Sun Apr 9 07:28:31 2006
@@ -1,15 +1,15 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/tabs.css"/>">
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/niftycorners/niftyCorners.css"/>">
- <link rel="stylesheet" type="text/css" href="<ww:url value="/webwork/niftycorners/niftyPrint.css"/>" media="print">
- <script type="text/javascript" src="<ww:url value="/webwork/niftycorners/nifty.js"/>"></script>
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/tabs.css"/>">
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/niftycorners/niftyCorners.css"/>">
+ <link rel="stylesheet" type="text/css" href="<saf:url value="/struts/niftycorners/niftyPrint.css"/>" media="print">
+ <script type="text/javascript" src="<saf:url value="/struts/niftycorners/nifty.js"/>"></script>
<script type="text/javascript">
dojo.event.connect(window, "onload", function() {
if (!NiftyCheck())
@@ -28,30 +28,30 @@
<tr>
<td align="top">
<!--// START SNIPPET: tabbedpanel-tag-->
- <ww:tabbedPanel id="test2" theme="simple" >
- <ww:panel id="left" tabName="left" theme="ajax">
+ <saf:tabbedPanel id="test2" theme="simple" >
+ <saf:panel id="left" tabName="left" theme="ajax">
This is the left pane<br/>
- <ww:form >
- <ww:textfield name="tt" label="Test Text" /> <br/>
- <ww:textfield name="tt2" label="Test Text2" />
- </ww:form>
- </ww:panel>
- <ww:panel remote="true" href="/AjaxTest.action" id="ryh1" theme="ajax" tabName="remote one" />
- <ww:panel id="middle" tabName="middle" theme="ajax">
+ <saf:form >
+ <saf:textfield name="tt" label="Test Text" /> <br/>
+ <saf:textfield name="tt2" label="Test Text2" />
+ </saf:form>
+ </saf:panel>
+ <saf:panel remote="true" href="/AjaxTest.action" id="ryh1" theme="ajax" tabName="remote one" />
+ <saf:panel id="middle" tabName="middle" theme="ajax">
middle tab<br/>
- <ww:form >
- <ww:textfield name="tt" label="Test Text44" /> <br/>
- <ww:textfield name="tt2" label="Test Text442" />
- </ww:form>
- </ww:panel>
- <ww:panel remote="true" href="/AjaxTest.action" id="ryh21" theme="ajax" tabName="remote right" />
- </ww:tabbedPanel>
+ <saf:form >
+ <saf:textfield name="tt" label="Test Text44" /> <br/>
+ <saf:textfield name="tt2" label="Test Text442" />
+ </saf:form>
+ </saf:panel>
+ <saf:panel remote="true" href="/AjaxTest.action" id="ryh21" theme="ajax" tabName="remote right" />
+ </saf:tabbedPanel>
<!--// END SNIPPET: tabbedpanel-tag-->
</td>
</tr>
</table>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/tabbedpanel/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>
<title>Tabbed Panes</title>
@@ -19,7 +19,7 @@
</p>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
<html>
<head>
@@ -15,22 +15,22 @@
</ul>
Default Editor configuration:<br/>
-<ww:form id="form1" action="AjaxRemoteForm" method="post">
- <ww:textarea name="data" theme="ajax" cols="50" rows="10" value="Test Data 1" />
- <ww:submit value="Submit"/>
-</ww:form>
+<saf:form id="form1" action="AjaxRemoteForm" method="post">
+ <saf:textarea name="data" theme="ajax" cols="50" rows="10" value="Test Data 1" />
+ <saf:submit value="Submit"/>
+</saf:form>
<br/>
Configured Editor configuration:<br/>
-<ww:form id="form2" action="AjaxRemoteForm" method="post">
- <ww:textarea id="editor2" name="data" theme="ajax" cols="50" rows="10" value="Test Data 2">
- <ww:param name="editorControls">textGroup;|;justifyGroup;|;listGroup;indentGroup</ww:param>
- </ww:textarea>
- <ww:submit value="Submit"/>
-</ww:form>
+<saf:form id="form2" action="AjaxRemoteForm" method="post">
+ <saf:textarea id="editor2" name="data" theme="ajax" cols="50" rows="10" value="Test Data 2">
+ <saf:param name="editorControls">textGroup;|;justifyGroup;|;listGroup;indentGroup</saf:param>
+ </saf:textarea>
+ <saf:submit value="Submit"/>
+</saf:form>
<br/>
-<ww:include value="../footer.jsp"/>
+<saf:include value="../footer.jsp"/>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/date.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/date.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/date.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/date.jsp Sun Apr 9 07:28:31 2006
@@ -1,2 +1,2 @@
-<%@ taglib prefix="ww" uri="/struts-action" %>
-<ww:date name="now"/>
+<%@ taglib prefix="saf" uri="/struts-action" %>
+<saf:date name="now"/>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp Sun Apr 9 07:28:31 2006
@@ -1,41 +1,41 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-action" prefix="saf" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<ww:if test="currentEmployee!=null">
- <ww:text id="title" name="item.edit"><ww:param><ww:text name="employee"/></ww:param></ww:text>
-</ww:if>
-<ww:else>
- <ww:text id="title" name="item.create"><ww:param><ww:text name="employee"/></ww:param></ww:text>
-</ww:else>
+<saf:if test="currentEmployee!=null">
+ <saf:text id="title" name="item.edit"><saf:param><saf:text name="employee"/></saf:param></saf:text>
+</saf:if>
+<saf:else>
+ <saf:text id="title" name="item.create"><saf:param><saf:text name="employee"/></saf:param></saf:text>
+</saf:else>
<html>
<head>
- <title><ww:property value="#title"/></title>
- <ww:head/>
+ <title><saf:property value="#title"/></title>
+ <saf:head/>
</head>
<body>
-<h1><ww:property value="#title"/></h1>
+<h1><saf:property value="#title"/></h1>
-<ww:action id="skillAction" namespace="/skill" name="list"/>
+<saf:action id="skillAction" namespace="/skill" name="list"/>
-<ww:form name="editForm" action="save">
- <ww:textfield label="Employee Id" name="currentEmployee.empId"/>
- <ww:textfield label="%{getText('employee.firstName')}" name="currentEmployee.firstName"/>
- <ww:textfield label="%{getText('employee.lastName')}" name="currentEmployee.lastName"/>
- <ww:datepicker label="Birthdate" name="currentEmployee.birthDate"/>
- <ww:textfield label="Salary" name="currentEmployee.salary"/>
- <ww:checkbox fieldValue="true" label="Married" name="currentEmployee.married"/>
- <ww:combobox list="availablePositions" label="Position" name="currentEmployee.position"/>
- <ww:select list="#skillAction.availableItems" listKey="name" label="Main Skill"
+<saf:form name="editForm" action="save">
+ <saf:textfield label="Employee Id" name="currentEmployee.empId"/>
+ <saf:textfield label="%{getText('employee.firstName')}" name="currentEmployee.firstName"/>
+ <saf:textfield label="%{getText('employee.lastName')}" name="currentEmployee.lastName"/>
+ <saf:datepicker label="Birthdate" name="currentEmployee.birthDate"/>
+ <saf:textfield label="Salary" name="currentEmployee.salary"/>
+ <saf:checkbox fieldValue="true" label="Married" name="currentEmployee.married"/>
+ <saf:combobox list="availablePositions" label="Position" name="currentEmployee.position"/>
+ <saf:select list="#skillAction.availableItems" listKey="name" label="Main Skill"
name="currentEmployee.mainSkill.name"/>
- <ww:select list="#skillAction.availableItems" listKey="name" listValue="description" label="Other Skills"
+ <saf:select list="#skillAction.availableItems" listKey="name" listValue="description" label="Other Skills"
name="selectedSkills" multiple="true"/>
- <ww:password label="Password" name="currentEmployee.password"/>
- <ww:radio list="availableLevels" name="currentEmployee.level"/>
- <ww:textarea label="Comment" name="currentEmployee.comment" cols="50" rows="3"/>
- <ww:submit value="%{getText('save')}" />
-</ww:form>
-<p><a href="<ww:url action="list"/>"><ww:text name="employee.backtolist"/></a></p>
+ <saf:password label="Password" name="currentEmployee.password"/>
+ <saf:radio list="availableLevels" name="currentEmployee.level"/>
+ <saf:textarea label="Comment" name="currentEmployee.comment" cols="50" rows="3"/>
+ <saf:submit value="%{getText('save')}" />
+</saf:form>
+<p><a href="<saf:url action="list"/>"><saf:text name="employee.backtolist"/></a></p>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp Sun Apr 9 07:28:31 2006
@@ -1,27 +1,27 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-action" prefix="saf" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<ww:if test="currentSkill!=null">
- <ww:set name="submitType" value="'update'"/>
- <ww:text id="title" name="item.edit"><ww:param><ww:text name="skill"/></ww:param></ww:text>
-</ww:if>
-<ww:else>
- <ww:set name="submitType" value="'create'"/>
- <ww:text id="title" name="item.create"><ww:param><ww:text name="skill"/></ww:param></ww:text>
-</ww:else>
+<saf:if test="currentSkill!=null">
+ <saf:set name="submitType" value="'update'"/>
+ <saf:text id="title" name="item.edit"><saf:param><saf:text name="skill"/></saf:param></saf:text>
+</saf:if>
+<saf:else>
+ <saf:set name="submitType" value="'create'"/>
+ <saf:text id="title" name="item.create"><saf:param><saf:text name="skill"/></saf:param></saf:text>
+</saf:else>
<html>
-<head><title><ww:property value="#title"/></title></head>
+<head><title><saf:property value="#title"/></title></head>
<body>
-<h1><ww:property value="#title"/></h1>
+<h1><saf:property value="#title"/></h1>
-<ww:form action="save">
- <ww:textfield label="%{getText('skill.name')}" name="currentSkill.name"/>
- <ww:textfield label="%{getText('skill.description')}" name="currentSkill.description"/>
- <%--ww:submit name="%{#submitType}" value="%{getText('save')}" /--%>
- <ww:submit value="%{getText('save')}" />
-</ww:form>
-<p><a href="<ww:url action="list"/>"><ww:text name="skill.backtolist"/></a></p>
+<saf:form action="save">
+ <saf:textfield label="%{getText('skill.name')}" name="currentSkill.name"/>
+ <saf:textfield label="%{getText('skill.description')}" name="currentSkill.description"/>
+ <%--saf:submit name="%{#submitType}" value="%{getText('save')}" /--%>
+ <saf:submit value="%{getText('save')}" />
+</saf:form>
+<p><a href="<saf:url action="list"/>"><saf:text name="skill.backtolist"/></a></p>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/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>
@@ -9,10 +9,10 @@
<p>
<ul>
- <li><ww:url id="url" namespace="/skill" action="list"/><ww:a href="%{url}">List available Skills</ww:a></li>
- <li><ww:url id="url" namespace="/skill" action="edit"/><ww:a href="%{url}">Create/Edit Skill</ww:a></li>
- <li><ww:url id="url" namespace="/employee" action="list"/><ww:a href="%{url}">List available Employees</ww:a></li>
- <li><ww:url id="url" namespace="/employee" action="edit"/><ww:a href="%{url}">Create/Edit Employee</ww:a></li>
+ <li><saf:url id="url" namespace="/skill" action="list"/><saf:a href="%{url}">List available Skills</saf:a></li>
+ <li><saf:url id="url" namespace="/skill" action="edit"/><saf:a href="%{url}">Create/Edit Skill</saf:a></li>
+ <li><saf:url id="url" namespace="/employee" action="list"/><saf:a href="%{url}">List available Employees</saf:a></li>
+ <li><saf:url id="url" namespace="/employee" action="edit"/><saf:a href="%{url}">Create/Edit Employee</saf:a></li>
</ul>
</p>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp Sun Apr 9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-action" prefix="saf" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
@@ -12,15 +12,15 @@
<th>First Name</th>
<th>Last Name</th>
</tr>
- <ww:iterator value="availableItems">
+ <saf:iterator value="availableItems">
<tr>
- <td><a href="<ww:url action="edit"><ww:param name="empId" value="empId"/></ww:url>"><ww:property value="empId"/></a></td>
- <td><ww:property value="firstName"/></td>
- <td><ww:property value="lastName"/></td>
+ <td><a href="<saf:url action="edit"><saf:param name="empId" value="empId"/></saf:url>"><saf:property value="empId"/></a></td>
+ <td><saf:property value="firstName"/></td>
+ <td><saf:property value="lastName"/></td>
</tr>
- </ww:iterator>
+ </saf:iterator>
</table>
-<p><a href="<ww:url action="edit" includeParams="none"/>">Create new Employee</a></p>
-<p><a href="<ww:url action="showcase" namespace="/" includeParams="none"/>">Back to Showcase Startpage</a></p>
+<p><a href="<saf:url action="edit" includeParams="none"/>">Create new Employee</a></p>
+<p><a href="<saf:url action="showcase" namespace="/" includeParams="none"/>">Back to Showcase Startpage</a></p>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp Sun Apr 9 07:28:31 2006
@@ -1,4 +1,4 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-action" prefix="saf" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
@@ -10,15 +10,15 @@
<tr>
<th>Name</th><th>Description</th>
</tr>
- <ww:iterator value="availableItems">
+ <saf:iterator value="availableItems">
<tr>
- <td><a href="<ww:url action="edit"><ww:param name="skillName" value="name"/></ww:url>"><ww:property value="name"/></a></td>
- <td><ww:property value="description"/></td>
+ <td><a href="<saf:url action="edit"><saf:param name="skillName" value="name"/></saf:url>"><saf:property value="name"/></a></td>
+ <td><saf:property value="description"/></td>
</tr>
- </ww:iterator>
+ </saf:iterator>
</table>
<!-- Although namescape not correctly specified, the following link should find the right action -->
-<p><a href="<ww:url action="edit" includeParams="none"/>">Create new Skill</a></p>
-<p><a href="<ww:url action="showcase" namespace="/" includeParams="none"/>">Back to Showcase Startpage</a></p>
+<p><a href="<saf:url action="edit" includeParams="none"/>">Create new Skill</a></p>
+<p><a href="<saf:url action="showcase" namespace="/" includeParams="none"/>">Back to Showcase Startpage</a></p>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/filedownload/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/filedownload/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/filedownload/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/filedownload/index.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>
<title>Showcase</title>
@@ -7,7 +7,7 @@
<body>
<h1>File Download Example</h1>
- Click this <ww:url id="url" action="download"/><ww:a href="%{url}">link</ww:a> to download WebWork logo.
+ Click this <saf:url id="url" action="download"/><saf:a href="%{url}">link</saf:a> to download Struts logo.
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload-success.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload-success.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload-success.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload-success.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>
<title>Showcase</title>
@@ -9,10 +9,10 @@
<p>
<ul>
- <li>ContentType: <ww:property value="uploadContentType" /></li>
- <li>FileName: <ww:property value="uploadFileName" /></li>
- <li>File: <ww:property value="upload" /></li>
- <li>Caption:<ww:property value="caption" /></li>
+ <li>ContentType: <saf:property value="uploadContentType" /></li>
+ <li>FileName: <saf:property value="uploadFileName" /></li>
+ <li>File: <saf:property value="upload" /></li>
+ <li>Caption:<saf:property value="caption" /></li>
</ul>
</p>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/fileupload/upload.jsp Sun Apr 9 07:28:31 2006
@@ -1,5 +1,5 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-action" prefix="saf" %>
<html>
<head>
<title>Showcase</title>
@@ -8,11 +8,11 @@
<body>
<h1>Fileupload sample</h1>
- <ww:form action="doUpload" method="POST" enctype="multipart/form-data">
- <ww:file name="upload" label="File"/>
- <ww:textfield name="caption" label="Caption"/>
- <ww:submit />
- </ww:form>
+ <saf:form action="doUpload" method="POST" enctype="multipart/form-data">
+ <saf:file name="upload" label="File"/>
+ <saf:textfield name="caption" label="Caption"/>
+ <saf:submit />
+ </saf:form>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/help.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/help.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/help.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/help.jsp Sun Apr 9 07:28:31 2006
@@ -1,7 +1,7 @@
-<%@taglib uri="/struts-action" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="saf" %>
<html>
<head>
- <title>WebWork ~ Getting Support</title>
+ <title>Struts ~ Getting Support</title>
</head>
<body>
@@ -15,7 +15,7 @@
</tr>
<tr>
<td><a href="http://forums.opensymphony.com/forum.jspa?forumID=1&start=0">User Forum</a></td>
- <td>Use this forum if you encounter problems while developing and using with WebWork</td>
+ <td>Use this forum if you encounter problems while developing and using with Struts</td>
</tr>
<tr>
<td><a href="http://wiki.opensymphony.com/display/WW/WebWork">Wiki</a></td>
@@ -25,7 +25,7 @@
</div>
<div id="local">
- <img src='<ww:url value="/images/logo.png"/>' alt="WebWork Logo" width="290" height="80"/>
+ <img src='<saf:url value="/images/logo.png"/>' alt="Struts Logo" width="290" height="80"/>
</div>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDriven.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,25 +6,25 @@
</head>
<body>
-<ww:form action="modelDrivenResult" method="POST" namespace="/modelDriven">
+<saf:form action="modelDrivenResult" method="POST" namespace="/modelDriven">
- <ww:textfield
+ <saf:textfield
label="Gangster Name"
name="name" />
- <ww:textfield
+ <saf:textfield
label="Gangster Age"
name="age" />
- <ww:checkbox
+ <saf:checkbox
label="Gangster Busted Before"
name="bustedBefore" />
- <ww:textarea
+ <saf:textarea
cols="30"
rows="5"
label="Gangster Description"
name="description" />
- <ww:submit />
+ <saf:submit />
-</ww:form>
+</saf:form>
</body>
</html>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.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:label
+ <saf:label
label="Gangster Name"
name="name" /><br/>
- <ww:label
+ <saf:label
label="Gangster Age"
name="age" /><br/>
- <ww:label
+ <saf:label
label="Busted Before"
name="bustedBefore" /><br/>
- <ww:label
+ <saf:label
label="Gangster Description"
name="description" /><br/>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/person/editPeople.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/person/editPeople.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/person/editPeople.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/person/editPeople.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,7 +6,7 @@
</head>
<body>
-<ww:form action="doEditPerson" theme="simple" validate="false">
+<saf:form action="doEditPerson" theme="simple" validate="false">
<table>
<tr>
@@ -14,23 +14,23 @@
<th>First Name</th>
<th>Last Name</th>
</tr>
- <ww:iterator id="p" value="persons">
+ <saf:iterator id="p" value="persons">
<tr>
<td>
- <ww:property value="%{id}" />
+ <saf:property value="%{id}" />
</td>
<td>
- <ww:textfield label="First Name" name="persons(%{id}).name" value="%{name}" theme="simple" />
+ <saf:textfield label="First Name" name="persons(%{id}).name" value="%{name}" theme="simple" />
</td>
<td>
- <ww:textfield label="Last Name" name="persons(%{id}).lastName" value="%{lastName}" theme="simple"/>
+ <saf:textfield label="Last Name" name="persons(%{id}).lastName" value="%{lastName}" theme="simple"/>
</td>
</tr>
- </ww:iterator>
+ </saf:iterator>
</table>
- <ww:submit value="Save all persons"/>
-</ww:form>
+ <saf:submit value="Save all persons"/>
+</saf:form>
<ul>
<li><a href="newPerson!input.action">Create</a> a new person</li>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/showcase.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/showcase.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/showcase.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/showcase.jsp Sun Apr 9 07:28:31 2006
@@ -4,11 +4,11 @@
@version $Date: 2006/03/20 16:04:09 $ $Id: showcase.jsp,v 1.17 2006/03/20 16:04:09 tmjee Exp $
--%>
-<%@ taglib uri="/struts-action" prefix="ww" %>
+<%@ taglib uri="/struts-action" prefix="saf" %>
<html>
<head>
<title>Showcase</title>
- <ww:head theme="simple"/>
+ <saf:head theme="simple"/>
</head>
<body>
@@ -19,43 +19,43 @@
<p>
<ul>
<!-- config-browser -->
- <li><ww:url id="url" namespace="/config-browser" action="index"/><ww:a href="%{url}">Configuration browser (Great for development!)</ww:a></li>
+ <li><saf:url id="url" namespace="/config-browser" action="index"/><saf:a href="%{url}">Configuration browser (Great for development!)</saf:a></li>
<!-- continuation -->
- <li><ww:url id="url" namespace="/continuations" action="guess"/><ww:a href="%{url}">Continuations Example</ww:a></li>
+ <li><saf:url id="url" namespace="/continuations" action="guess"/><saf:a href="%{url}">Continuations Example</saf:a></li>
<!-- tags -->
- <li><ww:url id="url" value="/tags"/><ww:a href="%{url}">Tags Examples</ww:a></li>
+ <li><saf:url id="url" value="/tags"/><saf:a href="%{url}">Tags Examples</saf:a></li>
<!-- fileupload -->
- <li><ww:url id="url" namespace="/fileupload" action="upload"/><ww:a href="%{url}">File Upload Example</ww:a></li>
+ <li><saf:url id="url" namespace="/fileupload" action="upload"/><saf:a href="%{url}">File Upload Example</saf:a></li>
<!-- crud -->
- <li><ww:url id="url" value="/empmanager"/><ww:a href="%{url}">CRUD Examples</ww:a></li>
+ <li><saf:url id="url" value="/empmanager"/><saf:a href="%{url}">CRUD Examples</saf:a></li>
<!-- person manager sample -->
- <li><ww:url id="url" value="/person"/><ww:a href="%{url}">PersonManager Sample</ww:a></li>
+ <li><saf:url id="url" value="/person"/><saf:a href="%{url}">PersonManager Sample</saf:a></li>
<!-- validation -->
- <li><ww:url id="url" value="/validation"/><ww:a href="%{url}">Validation Examples</ww:a></li>
+ <li><saf:url id="url" value="/validation"/><saf:a href="%{url}">Validation Examples</saf:a></li>
<!-- ajax -->
- <li><ww:url id="url" value="/ajax"/><ww:a href="%{url}">AJAX Examples</ww:a></li>
+ <li><saf:url id="url" value="/ajax"/><saf:a href="%{url}">AJAX Examples</saf:a></li>
<!-- action chaining -->
- <li><ww:url id="url" namespace="actionchaining" action="actionChain1" method="input" /><ww:a href="%{url}">Action Chaining Example</ww:a></li>
+ <li><saf:url id="url" namespace="actionchaining" action="actionChain1" method="input" /><saf:a href="%{url}">Action Chaining Example</saf:a></li>
<!-- execute and wait -->
- <li><ww:url id="url" value="/wait"/><ww:a href="%{url}">Execute and Wait Examples</ww:a></li>
+ <li><saf:url id="url" value="/wait"/><saf:a href="%{url}">Execute and Wait Examples</saf:a></li>
<!-- token -->
- <li><ww:url id="url" value="/token"/><ww:a href="%{url}">Token Examples (double post)</ww:a></li>
+ <li><saf:url id="url" value="/token"/><saf:a href="%{url}">Token Examples (double post)</saf:a></li>
<!-- filedownload -->
- <li><ww:url id="url" value="/filedownload"/><ww:a href="%{url}">File Download Example</ww:a></li>
+ <li><saf:url id="url" value="/filedownload"/><saf:a href="%{url}">File Download Example</saf:a></li>
<!-- model-driven -->
- <li><ww:url id="url" action="modelDriven" namespace="/modelDriven" method="input"/><ww:a href="%{url}">Model Driven Example</ww:a>
+ <li><saf:url id="url" action="modelDriven" namespace="/modelDriven" method="input"/><saf:a href="%{url}">Model Driven Example</saf:a>
</ul>
</p>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/index.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/index.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/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,8 +8,8 @@
<h1> Tags </h1>
<ul>
- <li><ww:url id="url" value="/tags/non-ui/" /><ww:a href="%{url}">Non UI Tags Examples</ww:a></li>
- <li><ww:url id="url" value="/tags/ui" /><ww:a href="%{url}">UI Tags Example</ww:a></li>
+ <li><saf:url id="url" value="/tags/non-ui/" /><saf:a href="%{url}">Non UI Tags Examples</saf:a></li>
+ <li><saf:url id="url" value="/tags/ui" /><saf:a href="%{url}">UI Tags Example</saf:a></li>
</ul>
</body>
Modified: incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp?rev=392735&r1=392734&r2=392735&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp (original)
+++ incubator/webwork2/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.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>
@@ -13,30 +13,30 @@
<!-- lets include the first page many times -->
<div style="margin: 5px; border: solid 1px; ">
-<ww:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<ww:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<ww:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
</div>
<!-- lets include the second page many times -->
<div style="margin: 5px; border: solid 1px; ">
-<ww:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<ww:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<ww:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
</div>
<!-- lets include the third page many time -->
<div style="margin: 5px; margin: 5px; border: solid 1px; ">
-<ww:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<ww:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<ww:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<saf:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
</div>
-<ww:url id="url" action="lookAtSource" namespace="/tags/non-ui/actionTag" />
-<ww:a href="%{#url}">Source</ww:a>
+<saf:url id="url" action="lookAtSource" namespace="/tags/non-ui/actionTag" />
+<saf:a href="%{#url}">Source</saf:a>
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org