Author: tmjee Date: Thu Apr 6 07:14:22 2006 New Revision: 391992 URL: http://svn.apache.org/viewcvs?rev=391992&view=rev Log: renamed webwork related stuff to struts
Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp incubator/webwork2/webapps/showcase/src/webapp/date.jsp incubator/webwork2/webapps/showcase/src/webapp/help.jsp incubator/webwork2/webapps/showcase/src/webapp/showcase.jsp Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml Thu Apr 6 07:14:22 2006 @@ -5,9 +5,9 @@ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml" /> + <include file="struts-default.xml" /> - <package name="actionchaining" extends="webwork-default" namespace="/actionchaining"> + <package name="actionchaining" extends="struts-default" namespace="/actionchaining"> <action name="actionChain1" class="org.apache.struts.action2.showcase.actionchaining.ActionChain1"> <result type="chain">actionChain2</result> </action> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml Thu Apr 6 07:14:22 2006 @@ -1,9 +1,9 @@ <!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml"/> + <include file="struts-default.xml"/> - <package name="ajax" extends="webwork-default"> + <package name="ajax" extends="struts-default"> <action name="AjaxTest" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction"> <result name="success">/ajax/AjaxResult.jsp</result> </action> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml Thu Apr 6 07:14:22 2006 @@ -1,8 +1,8 @@ <!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml"/> + <include file="struts-default.xml"/> - <package name="continuations" extends="webwork-default" namespace="/continuations"> + <package name="continuations" extends="struts-default" namespace="/continuations"> <action name="guess" class="org.apache.struts.action2.showcase.Guess"> <result type="freemarker">guess.ftl</result> </action> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml Thu Apr 6 07:14:22 2006 @@ -5,9 +5,9 @@ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml" /> + <include file="struts-default.xml" /> - <package name="filedownload" extends="webwork-default" namespace="/filedownload"> + <package name="filedownload" extends="struts-default" namespace="/filedownload"> <default-action-ref name="download"/> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml Thu Apr 6 07:14:22 2006 @@ -5,9 +5,9 @@ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml" /> + <include file="struts-default.xml" /> - <package name="fileupload" extends="webwork-default" namespace="/fileupload"> + <package name="fileupload" extends="struts-default" namespace="/fileupload"> <default-action-ref name="upload"/> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml Thu Apr 6 07:14:22 2006 @@ -5,9 +5,9 @@ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml" /> + <include file="struts-default.xml" /> - <package name="modelDriven" extends="webwork-default" namespace="/modelDriven"> + <package name="modelDriven" extends="struts-default" namespace="/modelDriven"> <!-- Diplay entry page that uses Model-Driven technique --> <action name="modelDriven" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction" method="input"> <result>modelDriven.jsp</result> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml Thu Apr 6 07:14:22 2006 @@ -3,9 +3,9 @@ <!-- START SNIPPET: xworkSample --> <xwork> - <include file="webwork-default.xml"/> + <include file="struts-default.xml"/> - <package name="person" extends="webwork-default" namespace="/person"> + <package name="person" extends="struts-default" namespace="/person"> <action name="listPeople" class="org.apache.struts.action2.showcase.person.ListPeople"> <interceptor-ref name="validationWorkflowStack"/> <result type="freemarker">listPeople.ftl</result> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml Thu Apr 6 07:14:22 2006 @@ -4,13 +4,13 @@ <xwork> - <include file="webwork-default.xml" /> + <include file="struts-default.xml" /> <!-- ================================== --> <!-- === Package for ActionTag Demo === --> <!-- ================================== --> - <package name="actionTag" extends="webwork-default" namespace="/tags/non-ui/actionTag"> + <package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag"> <action name="showActionTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show"> <result>/tags/non-ui/actionTag/showActionTagDemo.jsp</result> </action> @@ -32,7 +32,7 @@ <!-- === Package for IteratorGeneratorTag Demo === --> <!-- ==================================== --> - <package name="iteratorGeneratorTag" extends="webwork-default" namespace="/tags/non-ui/iteratorGeneratorTag"> + <package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag"> <action name="showGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input"> <result>/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result> </action> @@ -46,7 +46,7 @@ <!-- ===================================== --> <!-- === Package for AppendIteratorTag Demo === --> <!-- ========================================== --> - <package name="appendIteratorTag" extends="webwork-default" namespace="/tags/non-ui/appendIteratorTag"> + <package name="appendIteratorTag" extends="struts-default" namespace="/tags/non-ui/appendIteratorTag"> <action name="showAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input"> <result>/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result> </action> @@ -60,7 +60,7 @@ <!-- ====================================== --> <!-- === Package for MergeIteratorTag Demo === --> <!-- ========================================= --> - <package name="mergeIteratorTag" extends="webwork-default" namespace="/tags/non-ui/mergeIteratorTag"> + <package name="mergeIteratorTag" extends="struts-default" namespace="/tags/non-ui/mergeIteratorTag"> <action name="showMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input"> <result>/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result> </action> @@ -73,7 +73,7 @@ <!-- ============================================= --> <!-- === Package for SubsetIteratorTag Demo === --> <!-- =========================================== --> - <package name="subsetIteratorTag" extends="webwork-default" namespace="/tags/non-ui/subsetIteratorTag"> + <package name="subsetIteratorTag" extends="struts-default" namespace="/tags/non-ui/subsetIteratorTag"> <action name="showSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input"> <result>/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result> </action> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml Thu Apr 6 07:14:22 2006 @@ -1,8 +1,8 @@ <!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml"/> + <include file="struts-default.xml"/> - <package name="ui-tags" extends="webwork-default" namespace="/tags/ui"> + <package name="ui-tags" extends="struts-default" namespace="/tags/ui"> <action name="example" class="org.apache.struts.action2.showcase.UITagExample"> <result>example.jsp</result> <result name="input">example.jsp</result> @@ -40,7 +40,7 @@ - <package name="richtexteditor-browse" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp"> + <package name="richtexteditor-browse" extends="struts-default" namespace="/struts/richtexteditor/editor/filemanager/browser/default/connectors/jsp"> <action name="connector" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="browse"> <result name="getFolders" type="richtexteditorGetFolders" /> <result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" /> @@ -49,7 +49,7 @@ </action> </package> - <package name="richtexteditor-upload" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/upload"> + <package name="richtexteditor-upload" extends="struts-default" namespace="/struts/richtexteditor/editor/filemanager/upload"> <action name="uploader" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="upload"> <result name="richtexteditorFileUpload" /> </action> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml Thu Apr 6 07:14:22 2006 @@ -1,8 +1,8 @@ <!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml"/> + <include file="struts-default.xml"/> - <package name="token" extends="webwork-default" namespace="/token"> + <package name="token" extends="struts-default" namespace="/token"> <action name="tokenPrepare" class="org.apache.struts.action2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml Thu Apr 6 07:14:22 2006 @@ -3,9 +3,9 @@ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml" /> + <include file="struts-default.xml" /> - <package name="validation" extends="webwork-default" namespace="/validation"> + <package name="validation" extends="struts-default" namespace="/validation"> <action name="quizBasic" class="org.apache.struts.action2.showcase.validation.QuizAction"> <result name="input">quiz-basic.jsp</result> <result>quiz-success.jsp</result> @@ -28,7 +28,7 @@ </package> - <package name="validationExamples" extends="webwork-default" namespace="/validation" > + <package name="validationExamples" extends="struts-default" namespace="/validation" > <action name="list"> <result>index.jsp</result> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml Thu Apr 6 07:14:22 2006 @@ -1,8 +1,8 @@ <!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"> <xwork> - <include file="webwork-default.xml"/> + <include file="struts-default.xml"/> - <package name="wait" extends="webwork-default" namespace="/wait"> + <package name="wait" extends="struts-default" namespace="/wait"> <action name="longProcess1" class="org.apache.struts.action2.showcase.wait.LongProcessAction"> <interceptor-ref name="defaultStack"/> Modified: incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp (original) +++ incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp Thu Apr 6 07:14:22 2006 @@ -9,16 +9,16 @@ <%@ taglib uri="sitemesh-decorator" prefix="decorator" %> <%@ taglib uri="sitemesh-page" prefix="page" %> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="ww" uri="/struts-action" %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title><decorator:title default="WebWork Showcase"/></title> + <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='/webwork/niftycorners/niftyCorners.css'/>" rel="stylesheet" type="text/css"/> - <link href="<ww:url value='/webwork/niftycorners/niftyPrint.css'/>" rel="stylesheet" type="text/css" media="print"/> + <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"/> - <script language="JavaScript" type="text/javascript" src="<ww:url value='/webwork/niftycorners/nifty.js'/>"></script> + <script language="JavaScript" type="text/javascript" src="<ww:url value='/struts/niftycorners/nifty.js'/>"></script> <script language="JavaScript" type="text/javascript"> @@ -42,12 +42,12 @@ <div id="outer-header"> <div id="header" class="clearfix"> <div id="branding"> - <h1 class="title">WebWork Showcase</h1> + <h1 class="title">Struts Action Showcase</h1> <ww:action id="dateAction" name="date" namespace="/" executeResult="true" /> </div><!-- end branding --> <div id="search"> - <img src="<ww:url value='/images/logo-small.png'/>" alt="WebWork logo"/> + <img src="<ww:url value='/images/logo-small.png'/>" alt="Struts logo"/> </div><!-- end search --> <hr/> Modified: incubator/webwork2/webapps/showcase/src/webapp/date.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/date.jsp?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/date.jsp (original) +++ incubator/webwork2/webapps/showcase/src/webapp/date.jsp Thu Apr 6 07:14:22 2006 @@ -1,2 +1,2 @@ -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="ww" uri="/struts-action" %> <ww:date name="now"/> Modified: incubator/webwork2/webapps/showcase/src/webapp/help.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/help.jsp?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/help.jsp (original) +++ incubator/webwork2/webapps/showcase/src/webapp/help.jsp Thu Apr 6 07:14:22 2006 @@ -1,4 +1,4 @@ -<[EMAIL PROTECTED] uri="/webwork" prefix="ww" %> +<[EMAIL PROTECTED] uri="/struts-action" prefix="ww" %> <html> <head> <title>WebWork ~ Getting Support</title> Modified: incubator/webwork2/webapps/showcase/src/webapp/showcase.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/webapp/showcase.jsp?rev=391992&r1=391991&r2=391992&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/webapp/showcase.jsp (original) +++ incubator/webwork2/webapps/showcase/src/webapp/showcase.jsp Thu Apr 6 07:14:22 2006 @@ -4,7 +4,7 @@ @version $Date: 2006/03/20 16:04:09 $ $Id: showcase.jsp,v 1.17 2006/03/20 16:04:09 tmjee Exp $ --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-action" prefix="ww" %> <html> <head> <title>Showcase</title> @@ -14,7 +14,7 @@ <body> <h1>Showcase samples</h1> -<p>The given examples will demonstrate the usages of all WebWork tags as well as validations etc.</p> +<p>The given examples will demonstrate the usages of all Struts tags as well as validations etc.</p> <p> <ul> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]