Author: mrdon
Date: Sun Jul 9 20:33:56 2006
New Revision: 420410
URL: http://svn.apache.org/viewvc?rev=420410&view=rev
Log:
Changing xwork.xml configuration files to struts.xml
WW-1376
Added:
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/struts.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.xml
- copied, changed from r420385,
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-freemarker.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-hangman.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml
struts/struts2/trunk/apps/starter/src/main/resources/struts.xml
- copied, changed from r420374,
struts/struts2/trunk/apps/starter/src/main/resources/xwork.xml
struts/struts2/trunk/core/src/test/resources/struts.xml
- copied, changed from r420385,
struts/struts2/trunk/core/src/test/resources/xwork.xml
Removed:
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
struts/struts2/trunk/apps/shopping-cart/src/main/resources/xwork.xml
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-freemarker.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-hangman.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml
struts/struts2/trunk/apps/starter/src/main/resources/xwork.xml
struts/struts2/trunk/apps/starter/src/main/webapp/WEB-INF/classes/
struts/struts2/trunk/core/src/main/resources/struts-jsf.xml
struts/struts2/trunk/core/src/test/resources/xwork.xml
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
struts/struts2/trunk/core/src/main/resources/config-browser.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml
Copied:
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/struts.xml
(from r420374,
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/struts.xml?p2=struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/struts.xml&p1=struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
(original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/struts.xml
Sun Jul 9 20:33:56 2006
@@ -1,6 +1,8 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml"/>
<package name="default" extends="struts-default">
@@ -13,4 +15,4 @@
<!-- Add your actions here -->
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.xml
(from r420385,
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.xml?p2=struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.xml&p1=struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml&r1=420385&r2=420410&rev=420410&view=diff
==============================================================================
---
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
(original)
+++
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.xml
Sun Jul 9 20:33:56 2006
@@ -1,14 +1,54 @@
-<validators>
- <validator name="required"
class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
- <validator name="requiredstring"
class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
- <validator name="int"
class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
- <validator name="double"
class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
- <validator name="date"
class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
- <validator name="expression"
class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression"
class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
- <validator name="email"
class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
- <validator name="url"
class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
- <validator name="visitor"
class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
- <validator name="conversion"
class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
- <validator name="stringlength"
class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
-</validators>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
+ <include file="struts-default.xml"/>
+ <include file="config-browser.xml"/>
+
+ <package name="catalog" namespace="/catalog" extends="struts-default">
+ <interceptors>
+ <!-- Basic stack -->
+ <interceptor-stack name="catalogStack">
+ <interceptor-ref name="logger"/>
+ <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="static-params"/>
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="conversionError"/>
+ <interceptor-ref name="validation"/>
+ <interceptor-ref name="workflow"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <default-interceptor-ref name="catalogStack"/>
+
+ <action name="catalog"
class="org.apache.struts2.example.ajax.actions.ShowCatalog">
+ <result name="success">/category.jsp</result>
+ </action>
+
+ <action name="cart"
class="org.apache.struts2.example.ajax.actions.ShowCart">
+ <result name="success">/cart.jsp</result>
+ </action>
+
+ <action name="main"
class="org.apache.struts2.example.ajax.actions.ActiveCategory">
+ <result name="success">/category-main.jsp</result>
+ </action>
+
+
+ </package>
+ <package name="catalog-remote" namespace="/catalog/remote"
extends="catalog">
+ <action name="activeCategory"
class="org.apache.struts2.example.ajax.actions.ActiveCategory">
+ <result name="success">/category.jsp</result>
+ </action>
+
+ <action name="setActiveCategory"
class="org.apache.struts2.example.ajax.actions.SetActiveCategory">
+ <result name="success" type="chain">activeCategory</result>
+ </action>
+
+ <action name="updateQuantity"
class="org.apache.struts2.example.ajax.actions.UpdateQuantityInCart"/>
+
+ </package>
+</struts>
+
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="actionchaining" extends="struts-default"
namespace="/actionchaining">
@@ -18,6 +18,6 @@
<result>/actionchaining/actionChainingResult.jsp</result>
</action>
</package>
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml Sun
Jul 9 20:33:56 2006
@@ -1,6 +1,8 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml"/>
<package name="ajax" extends="struts-default">
@@ -40,4 +42,4 @@
<result>/ajax/tree/toggle.jsp</result>
</action>
</package>
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml Sun
Jul 9 20:33:56 2006
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="chat" extends="struts-default" namespace="/chat">
<interceptors>
@@ -132,5 +132,5 @@
<result
type="freemarker">/chat/usersAvailableInRoom.ftl</result>
</action>
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml
Sun Jul 9 20:33:56 2006
@@ -1,5 +1,7 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
<include file="struts-default.xml"/>
<package name="continuations" extends="struts-default"
namespace="/continuations">
@@ -7,4 +9,4 @@
<result type="freemarker">guess.ftl</result>
</action>
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="conversion" namespace="/conversion"
extends="struts-default">
@@ -27,4 +27,4 @@
<result
type="plaintext">/conversion/Person.java.txt</result>
</action>
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="filedownload" extends="struts-default"
namespace="/filedownload">
@@ -21,6 +21,6 @@
</action>
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="fileupload" extends="struts-default"
namespace="/fileupload">
@@ -20,6 +20,6 @@
</action>
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-freemarker.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-freemarker.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-freemarker.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml
Sun Jul 9 20:33:56 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="freemarker" namespace="/freemarker"
extends="struts-default">
@@ -13,4 +13,4 @@
<result
type="freemarker">/freemarker/customFreemarkerManagerUsage.ftl</result>
</action>
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml (from
r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-hangman.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-hangman.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-hangman.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="hangman" extends="struts-default" namespace="/hangman">
<action name="hangman" class="startHangmanAction">
@@ -37,4 +37,4 @@
<result
type="freemarker">/hangman/updateGuessLeft.ftl</result>
</action>
</package>
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml Sun
Jul 9 20:33:56 2006
@@ -1,33 +1,34 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
- <include file="struts-default.xml"/>
- <include file="struts-jsf.xml"/>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+ <include file="struts-default.xml"/>
- <package name="jsf" extends="struts-default, struts-jsf"
namespace="/jsf">
- <interceptors>
- <interceptor-stack name="jsfFullStack">
- <interceptor-ref name="params" />
- <interceptor-ref name="basicStack"/>
- <interceptor-ref name="jsfStack"/>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="jsfFullStack"/>
- </package>
-
- <package name="jsf.employee" extends="jsf" namespace="/jsf/employee">
+ <package name="jsf" extends="struts-default" namespace="/jsf">
+ <interceptors>
+ <interceptor-stack name="jsfFullStack">
+ <interceptor-ref name="params" />
+ <interceptor-ref name="basicStack"/>
+ <interceptor-ref name="jsfStack"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <default-interceptor-ref name="jsfFullStack"/>
+ </package>
+
+ <package name="jsf.employee" extends="jsf" namespace="/jsf/employee">
+
+ <action name="list"
class="org.apache.struts2.showcase.jsf.JsfEmployeeAction" method="list">
+ <result name="success" type="jsf" />
+ </action>
+ <action name="edit"
class="org.apache.struts2.showcase.jsf.JsfEmployeeAction">
+ <result name="success" type="jsf" />
+ </action>
+ <action name="delete"
class="org.apache.struts2.showcase.action.EmployeeAction" method="delete">
+ <result name="error" type="redirect">list.action</result>
+ <result type="redirect">list.action</result>
+ </action>
+
+ </package>
- <action name="list"
class="org.apache.struts2.showcase.jsf.JsfEmployeeAction" method="list">
- <result name="success" type="jsf" />
- </action>
- <action name="edit"
class="org.apache.struts2.showcase.jsf.JsfEmployeeAction">
- <result name="success" type="jsf" />
- </action>
- <action name="delete"
class="org.apache.struts2.showcase.action.EmployeeAction" method="delete">
- <result name="error"
type="redirect">list.action</result>
- <result type="redirect">list.action</result>
- </action>
-
- </package>
-
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="modelDriven" extends="struts-default"
namespace="/modelDriven">
@@ -18,5 +18,5 @@
<result>modelDrivenResult.jsp</result>
</action>
</package>
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml Sun
Jul 9 20:33:56 2006
@@ -1,8 +1,10 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<!-- START SNIPPET: xworkSample -->
-<xwork>
+<struts>
<include file="struts-default.xml"/>
<package name="person" extends="struts-default" namespace="/person">
@@ -25,7 +27,7 @@
<result type="redirect">listPeople.action</result>
</action>
</package>
-</xwork>
+</struts>
<!-- END SNIPPET: xworkSample -->
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
Sun Jul 9 20:33:56 2006
@@ -1,8 +1,8 @@
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
@@ -111,5 +111,5 @@
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml (from
r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
Sun Jul 9 20:33:56 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml"/>
<package name="ui-tags" extends="struts-default" namespace="/tags/ui">
@@ -70,4 +70,4 @@
</package>
<!-- END SNIPPET: treeExampleXWorkXml -->
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags.xml Sun
Jul 9 20:33:56 2006
@@ -1,5 +1,7 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
- <include file="xwork-tags-ui.xml"/>
- <include file="xwork-tags-non-ui.xml" />
-</xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+ <include file="struts-tags-ui.xml"/>
+ <include file="struts-tags-non-ui.xml" />
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml Sun
Jul 9 20:33:56 2006
@@ -1,5 +1,7 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
<include file="struts-default.xml"/>
<package name="token" extends="struts-default" namespace="/token">
@@ -60,4 +62,4 @@
</package>
-</xwork>
+</struts>
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
Sun Jul 9 20:33:56 2006
@@ -1,8 +1,8 @@
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="validation" extends="struts-default"
namespace="/validation">
@@ -96,5 +96,5 @@
</package>
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml
(from r420374,
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml Sun
Jul 9 20:33:56 2006
@@ -1,5 +1,7 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
<include file="struts-default.xml"/>
<package name="wait" extends="struts-default" namespace="/wait">
@@ -32,4 +34,4 @@
</package>
-</xwork>
+</struts>
Copied: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (from
r420374, struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml&p1=struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Sun Jul 9
20:33:56 2006
@@ -1,48 +1,48 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<!-- START SNIPPET: xworkSample -->
-<xwork>
+<struts>
<include file="struts-default.xml"/>
<include file="config-browser.xml"/>
- <include file="xwork-chat.xml" />
+ <include file="struts-chat.xml" />
- <include file="xwork-hangman.xml" />
+ <include file="struts-hangman.xml" />
- <include file="xwork-continuations.xml"/>
+ <include file="struts-continuations.xml"/>
- <include file="xwork-tags.xml"/>
+ <include file="struts-tags.xml"/>
- <include file="xwork-validation.xml" />
+ <include file="struts-validation.xml" />
- <include file="xwork-actionchaining.xml" />
+ <include file="struts-actionchaining.xml" />
- <include file="xwork-ajax.xml" />
+ <include file="struts-ajax.xml" />
- <include file="xwork-fileupload.xml" />
+ <include file="struts-fileupload.xml" />
- <include file="xwork-person.xml" />
+ <include file="struts-person.xml" />
- <include file="xwork-wait.xml" />
+ <include file="struts-wait.xml" />
- <include file="xwork-jsf.xml" />
+ <include file="struts-jsf.xml" />
- <include file="xwork-token.xml" />
+ <include file="struts-token.xml" />
- <include file="xwork-model-driven.xml" />
+ <include file="struts-model-driven.xml" />
- <include file="xwork-filedownload.xml" />
+ <include file="struts-filedownload.xml" />
- <include file="xwork-conversion.xml" />
+ <include file="struts-conversion.xml" />
- <include file="xwork-freemarker.xml" />
+ <include file="struts-freemarker.xml" />
<package name="default" extends="struts-default">
<interceptors>
@@ -109,7 +109,7 @@
</action>
</package>
-</xwork>
+</struts>
<!-- END SNIPPET: xworkSample -->
Copied: struts/struts2/trunk/apps/starter/src/main/resources/struts.xml (from
r420374, struts/struts2/trunk/apps/starter/src/main/resources/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/starter/src/main/resources/struts.xml?p2=struts/struts2/trunk/apps/starter/src/main/resources/struts.xml&p1=struts/struts2/trunk/apps/starter/src/main/resources/xwork.xml&r1=420374&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/apps/starter/src/main/resources/xwork.xml (original)
+++ struts/struts2/trunk/apps/starter/src/main/resources/struts.xml Sun Jul 9
20:33:56 2006
@@ -1,6 +1,10 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<?xml version="1.0" encoding="UTF-8" ?>
-<xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
<include file="struts-default.xml"/>
<package name="default" extends="struts-default">
@@ -23,4 +27,4 @@
</action>
</package>
-</xwork>
+</struts>
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java?rev=420410&r1=420409&r2=420410&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
Sun Jul 9 20:33:56 2006
@@ -215,7 +215,13 @@
configurationManager = new ConfigurationManager();
configurationManager.addConfigurationProvider(new
XmlConfigurationProvider("xwork.xml", false));
- configurationManager.addConfigurationProvider(new
XmlConfigurationProvider("struts.xml", false));
+
+ // Load Struts config files
+ Map<String,String> dtdMappings = new HashMap<String,String>();
+ dtdMappings.put("-//Apache Software Foundation//DTD Struts
Configuration 2.0//EN", "struts-2.0.dtd");
+ XmlConfigurationProvider prov = new
XmlConfigurationProvider("struts.xml", false);
+ prov.setDtdMappings(dtdMappings);
+ configurationManager.addConfigurationProvider(prov);
synchronized(DispatcherUtils.class) {
if (dispatcherListeners.size() > 0) {
Modified: struts/struts2/trunk/core/src/main/resources/config-browser.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser.xml?rev=420410&r1=420409&r2=420410&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/config-browser.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/config-browser.xml Sun Jul 9
20:33:56 2006
@@ -1,6 +1,10 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<?xml version="1.0" encoding="UTF-8" ?>
-<xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
<include file="struts-default.xml"/>
<package name="config" extends="struts-default"
namespace="/config-browser">
@@ -38,4 +42,4 @@
<result type="freemarker"
name="success">/config-browser/validatorDetails.ftl</result>
</action>
</package>
-</xwork>
+</struts>
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=420410&r1=420409&r2=420410&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sun Jul 9
20:33:56 2006
@@ -1,5 +1,10 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
<package name="struts-default">
<result-types>
<result-type name="chain"
class="com.opensymphony.xwork2.ActionChainResult"/>
@@ -16,6 +21,8 @@
<!-- third party integration -->
<result-type name="jasper"
class="org.apache.struts2.views.jasperreports.JasperReportsResult"/>
+
+ <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult"
/>
</result-types>
<interceptors>
@@ -43,6 +50,14 @@
<interceptor name="token-session"
class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="validation"
class="com.opensymphony.xwork2.validator.ValidationInterceptor"/>
<interceptor name="workflow"
class="com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor"/>
+
+ <!-- JSF interceptors, one per lifecycle phase -->
+ <interceptor class="org.apache.struts2.jsf.FacesSetupInterceptor"
name="jsfSetup" />
+ <interceptor class="org.apache.struts2.jsf.RestoreViewInterceptor"
name="jsfRestore" />
+ <interceptor
class="org.apache.struts2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
+ <interceptor
class="org.apache.struts2.jsf.ProcessValidationsInterceptor" name="jsfValidate"
/>
+ <interceptor
class="org.apache.struts2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
+ <interceptor
class="org.apache.struts2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
<!-- Basic stack -->
<interceptor-stack name="basicStack">
@@ -168,9 +183,19 @@
<param name="excludeMethods">input,back,cancel</param>
</interceptor-ref>
</interceptor-stack>
+
+ <!-- Sample JSF stack, can be combined with other stacks easily -->
+ <interceptor-stack name="jsfStack">
+ <interceptor-ref name="jsfSetup" />
+ <interceptor-ref name="jsfRestore" />
+ <interceptor-ref name="jsfApply" />
+ <interceptor-ref name="jsfValidate" />
+ <interceptor-ref name="jsfUpdate" />
+ <interceptor-ref name="jsfInvoke" />
+ </interceptor-stack>
</interceptors>
-
+
<default-interceptor-ref name="defaultStack"/>
</package>
-</xwork>
+</struts>
Modified:
struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml?rev=420410&r1=420409&r2=420410&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml
(original)
+++ struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml Sun
Jul 9 20:33:56 2006
@@ -1,5 +1,10 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-<xwork>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+<struts>
<include file="struts-default.xml"/>
<package name="struts-portlet-default" extends="struts-default">
@@ -20,4 +25,4 @@
<result type="velocity"
name="success">${location}</result>
</action>
</package>
-</xwork>
\ No newline at end of file
+</struts>
\ No newline at end of file
Copied: struts/struts2/trunk/core/src/test/resources/struts.xml (from r420385,
struts/struts2/trunk/core/src/test/resources/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/struts.xml?p2=struts/struts2/trunk/core/src/test/resources/struts.xml&p1=struts/struts2/trunk/core/src/test/resources/xwork.xml&r1=420385&r2=420410&rev=420410&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/xwork.xml (original)
+++ struts/struts2/trunk/core/src/test/resources/struts.xml Sun Jul 9 20:33:56
2006
@@ -1,6 +1,7 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
-
-<xwork>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
<include file="struts-default.xml"/>
<package name="default" extends="struts-default">
@@ -33,4 +34,4 @@
<result name="error">guess-error.ftl</result>
</action>
</package>
-</xwork>
+</struts>
