From 08627ef54de21d0d6d4f910ad64194490a843d91 Mon Sep 17 00:00:00 2001
From: Toby Jee <tmjee@apache.org>
Date: Thu, 6 Apr 2006 14:14:22 +0000
Subject: [PATCH] renamed webwork related stuff to struts

git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@391992 13f79535-47bb-0310-9956-ffa450edef68
---
 .../WEB-INF/classes/xwork-actionchaining.xml       |  4 ++--
 .../src/webapp/WEB-INF/classes/xwork-ajax.xml      |  4 ++--
 .../webapp/WEB-INF/classes/xwork-continuations.xml |  4 ++--
 .../webapp/WEB-INF/classes/xwork-filedownload.xml  |  4 ++--
 .../webapp/WEB-INF/classes/xwork-fileupload.xml    |  4 ++--
 .../webapp/WEB-INF/classes/xwork-model-driven.xml  |  4 ++--
 .../src/webapp/WEB-INF/classes/xwork-person.xml    |  4 ++--
 .../webapp/WEB-INF/classes/xwork-tags-non-ui.xml   | 12 ++++++------
 .../src/webapp/WEB-INF/classes/xwork-tags-ui.xml   |  8 ++++----
 .../src/webapp/WEB-INF/classes/xwork-token.xml     |  4 ++--
 .../webapp/WEB-INF/classes/xwork-validation.xml    |  6 +++---
 .../src/webapp/WEB-INF/classes/xwork-wait.xml      |  4 ++--
 .../src/webapp/WEB-INF/decorators/main.jsp         | 14 +++++++-------
 webapps/showcase/src/webapp/date.jsp               |  2 +-
 webapps/showcase/src/webapp/help.jsp               |  2 +-
 webapps/showcase/src/webapp/showcase.jsp           |  4 ++--
 16 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
index f777a8ae0..9809fd920 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
index e04709fa2..18c6a380b 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
index 5b3044079..a59e2a92b 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
index d508e3a52..dc6f70b13 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
@@ -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"/>
 
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
index 66e35c313..89464630f 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
@@ -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"/>
 
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
index c5b3d6393..dd217e804 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
index ae2508f66..bd3d4f48c 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
index aa50c22ef..b17f29af6 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
index 543b8798a..82eaf4b2f 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
@@ -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>    
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
index a8f9b8f32..d5aad93ae 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
@@ -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"/>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
index 89b5d222b..7b280d245 100755
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
@@ -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>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
index 04ac2a2fb..aac4426b6 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
@@ -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"/>
diff --git a/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp b/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp
index b99556d6e..da1db43a5 100644
--- a/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp
+++ b/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp
@@ -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/>
diff --git a/webapps/showcase/src/webapp/date.jsp b/webapps/showcase/src/webapp/date.jsp
index 0ad9555f7..a829d2d1f 100644
--- a/webapps/showcase/src/webapp/date.jsp
+++ b/webapps/showcase/src/webapp/date.jsp
@@ -1,2 +1,2 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="ww" uri="/struts-action" %>
 <ww:date name="now"/>
diff --git a/webapps/showcase/src/webapp/help.jsp b/webapps/showcase/src/webapp/help.jsp
index 7624cb345..3263c62b3 100644
--- a/webapps/showcase/src/webapp/help.jsp
+++ b/webapps/showcase/src/webapp/help.jsp
@@ -1,4 +1,4 @@
-<%@taglib uri="/webwork" prefix="ww" %>
+<%@taglib uri="/struts-action" prefix="ww" %>
 <html>
 <head>
     <title>WebWork ~ Getting Support</title>
diff --git a/webapps/showcase/src/webapp/showcase.jsp b/webapps/showcase/src/webapp/showcase.jsp
index c91c7dea9..b0021a443 100644
--- a/webapps/showcase/src/webapp/showcase.jsp
+++ b/webapps/showcase/src/webapp/showcase.jsp
@@ -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>