Author: hermanns Date: Wed Apr 12 11:27:33 2006 New Revision: 393565 URL: http://svn.apache.org/viewcvs?rev=393565&view=rev Log: o fixing tag prefix and mapping o cleaning up o fixing property names
Modified: incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/web.xml Modified: incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties?rev=393565&r1=393564&r2=393565&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties (original) +++ incubator/webwork2/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties Wed Apr 12 11:27:33 2006 @@ -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 Modified: incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties?rev=393565&r1=393564&r2=393565&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties (original) +++ incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties Wed Apr 12 11:27:33 2006 @@ -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 Modified: incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/web.xml?rev=393565&r1=393564&r2=393565&view=diff ============================================================================== --- incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/web.xml Wed Apr 12 11:27:33 2006 @@ -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 --> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]