From 288fe10b8a6e9507c3594d4179a70d847f1a9730 Mon Sep 17 00:00:00 2001
From: Rainer Hermanns <hermanns@apache.org>
Date: Wed, 12 Apr 2006 18:27:33 +0000
Subject: [PATCH] o fixing tag prefix and mapping o cleaning up o fixing
 property names

git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@393565 13f79535-47bb-0310-9956-ffa450edef68
---
 .../action2/showcase/DateAction.properties    |  2 +-
 .../webapp/WEB-INF/classes/webwork.properties | 16 ++++++-------
 .../showcase/src/main/webapp/WEB-INF/web.xml  | 24 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
index b5d04edd2..d49c743a5 100644
--- a/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
+++ b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
@@ -1 +1 @@
-webwork.date.format=yyyy/MM/dd hh:mm:ss
\ No newline at end of file
+struts.date.format=yyyy/MM/dd hh:mm:ss
\ No newline at end of file
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties b/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
index 783800f27..cebe63760 100644
--- a/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
+++ b/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
@@ -1,8 +1,8 @@
-webwork.i18n.reload=true
-webwork.devMode = true
-webwork.configuration.xml.reload=true
-webwork.continuations.package = org.apache.struts.action2.showcase
-webwork.objectFactory = spring
-webwork.custom.i18n.resources=globalMessages
-#webwork.action.extension=jspa
-webwork.url.http.port = 8080
+struts.i18n.reload=true
+struts.devMode = true
+struts.configuration.xml.reload=true
+struts.continuations.package = org.apache.struts.action2.showcase
+struts.objectFactory = spring
+struts.custom.i18n.resources=globalMessages
+#struts.action.extension=jspa
+struts.url.http.port = 8080
diff --git a/webapps/showcase/src/main/webapp/WEB-INF/web.xml b/webapps/showcase/src/main/webapp/WEB-INF/web.xml
index c0decc076..f60362634 100644
--- a/webapps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/webapps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -5,12 +5,12 @@
     <display-name>WebWork Showcase Application</display-name>
 
     <filter>
-        <filter-name>webwork-cleanup</filter-name>
+        <filter-name>action2-cleanup</filter-name>
         <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
     </filter>
 
     <filter>
-        <filter-name>webwork</filter-name>
+        <filter-name>action2</filter-name>
         <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
@@ -20,7 +20,7 @@
     </filter>
 
     <filter-mapping>
-        <filter-name>webwork-cleanup</filter-name>
+        <filter-name>action2-cleanup</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
@@ -30,7 +30,7 @@
     </filter-mapping>
 
     <filter-mapping>
-        <filter-name>webwork</filter-name>
+        <filter-name>action2</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
@@ -60,7 +60,7 @@
 
     <!-- SNIPPET START: example.velocity.filter.chain
         <filter>
-            <filter-name>webwork-cleanup</filter-name>
+            <filter-name>action2-cleanup</filter-name>
             <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
         </filter>
         <filter>
@@ -68,12 +68,12 @@
             <filter-class>org.apache.struts.action2.sitemesh.VelocityPageFilter</filter-class>
         </filter>
         <filter>
-            <filter-name>webwork</filter-name>
+            <filter-name>action2</filter-name>
             <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
         </filter>
 
         <filter-mapping>
-            <filter-name>webwork-cleanup</filter-name>
+            <filter-name>action2-cleanup</filter-name>
             <url-pattern>/*</url-pattern>
         </filter-mapping>
         <filter-mapping>
@@ -81,14 +81,14 @@
             <url-pattern>/*</url-pattern>
         </filter-mapping>
         <filter-mapping>
-            <filter-name>webwork</filter-name>
+            <filter-name>action2</filter-name>
             <url-pattern>/*</url-pattern>
         </filter-mapping>
     END SNIPPET: example.velocity.filter.chain -->
 
     <!-- SNIPPET START: example.freemarker.filter.chain
     <filter>
-        <filter-name>webwork-cleanup</filter-name>
+        <filter-name>action2-cleanup</filter-name>
         <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
     </filter>
     <filter>
@@ -96,12 +96,12 @@
         <filter-class>org.apache.struts.action2.sitemesh.FreeMarkerPageFilter</filter-class>
     </filter>
     <filter>
-        <filter-name>webwork</filter-name>
+        <filter-name>action2</filter-name>
         <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter-mapping>
-        <filter-name>webwork-cleanup</filter-name>
+        <filter-name>action2-cleanup</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
@@ -109,7 +109,7 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
-        <filter-name>webwork</filter-name>
+        <filter-name>action2</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     END SNIPPET: example.freemarker.filter.chain -->