You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by he...@apache.org on 2006/04/11 13:41:41 UTC
svn commit: r393193 - in
/incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF:
classes/struts.properties classes/webwork.properties classes/xwork.xml
web.xml
Author: hermanns
Date: Tue Apr 11 04:41:39 2006
New Revision: 393193
URL: http://svn.apache.org/viewcvs?rev=393193&view=rev
Log:
Refactoring webwork-> action2 names for starter sample app
o adjusting configurations
Added:
incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties (contents, props changed)
- copied, changed from r393165, incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties
Removed:
incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties
Modified:
incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/web.xml
Copied: incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties (from r393165, incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties?p2=incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties&p1=incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties&r1=393165&r2=393193&rev=393193&view=diff
==============================================================================
--- incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties (original)
+++ incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties Tue Apr 11 04:41:39 2006
@@ -1,2 +1,2 @@
-webwork.objectFactory = spring
-webwork.devMode = true
+struts.objectFactory = spring
+struts.devMode = true
Propchange: incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/struts.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml?rev=393193&r1=393192&r2=393193&view=diff
==============================================================================
--- incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml (original)
+++ incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml Tue Apr 11 04:41:39 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="default" extends="webwork-default">
+ <package name="default" extends="struts-default">
<default-action-ref name="home" />
Modified: incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/web.xml?rev=393193&r1=393192&r2=393193&view=diff
==============================================================================
--- incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/webwork2/webapps/blank/src/main/webapp/WEB-INF/web.xml Tue Apr 11 04:41:39 2006
@@ -5,12 +5,12 @@
<display-name>Acme Corp</display-name>
<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</filter-name>
+ <filter-name>action2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
@@ -25,12 +25,12 @@
</welcome-file-list>
<!--
- This typically isn't required, as the taglib is included in webwork.jar.
- If you really need a taglib configuration within web.xml, copy webwork/src/java/META-INF/taglib.tld
- to the WEB-INF directory as webwork.tld.
+ This typically isn't required, as the taglib is included in struts-action-2.0.jar.
+ If you really need a taglib configuration within web.xml, copy struts/src/java/META-INF/taglib.tld
+ to the WEB-INF directory as struts-action.tld.
-->
<!--taglib>
- <taglib-uri>webwork</taglib-uri>
- <taglib-location>/WEB-INF/webwork.tld</taglib-location>
+ <taglib-uri>struts-action</taglib-uri>
+ <taglib-location>/WEB-INF/struts-action.tld</taglib-location>
</taglib-->
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org