Author: hermanns Date: Wed Apr 12 11:24:30 2006 New Revision: 393564 URL: http://svn.apache.org/viewcvs?rev=393564&view=rev Log: o fixing tag prefix and mapping o cleaning up o fixing property names
Removed: incubator/webwork2/webapps/shopping-cart/src/main/webapp/images/Thumbs.db Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties?rev=393564&r1=393563&r2=393564&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties Wed Apr 12 11:24:30 2006 @@ -1,16 +1,16 @@ # extension for actions -webwork.action.extension=action +struts.action.extension=action # spring integration -webwork.objectFactory=spring -webwork.objectFactory.spring.autoWire=type +struts.objectFactory=spring +struts.objectFactory.spring.autoWire=type ### Configuration reloading # This will cause the configuration to reload xwork.xml when it is changed -webwork.configuration.xml.reload=true +struts.configuration.xml.reload=true ### Load custom default resource bundles -webwork.custom.i18n.resources=default +struts.custom.i18n.resources=default ### character encoding -webwork.i18n.encoding=UTF-8 +struts.i18n.encoding=UTF-8 Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties?rev=393564&r1=393563&r2=393564&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties Wed Apr 12 11:24:30 2006 @@ -1,3 +1,3 @@ -# Velocity Macro libraries. The webwork.vm comes standard with webwork. The tigris-macros.vm comes with the config +# Velocity Macro libraries. The struts.vm comes standard with Struts Action 2. The tigris-macros.vm comes with the config # browser. -velocimacro.library = webwork.vm, tigris-macros.vm +velocimacro.library = struts.vm, tigris-macros.vm Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml?rev=393564&r1=393563&r2=393564&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml Wed Apr 12 11:24:30 2006 @@ -5,7 +5,7 @@ <web-app> <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-mapping> <filter-mapping> - <filter-name>webwork</filter-name> + <filter-name>action2</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]