Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 11:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing xwork.xml configuration files to struts.xml

Browse Source 
WW-1376


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@420410 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-07-10 03:33:56 +00:00
parent 56b589c842
commit 81d16062ed
33 changed files with 218 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml → apps/blank/src/main/webapp/WEB-INF/classes/struts.xml
+5 -3
View File
@@ -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>
apps/shopping-cart/src/main/resources/xwork.xml → apps/shopping-cart/src/main/webapp/WEB-INF/classes/struts.xml
+8 -3
View File
@@ -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"/>
<include file="config-browser.xml"/>
@@ -46,4 +50,5 @@
<action name="updateQuantity" class="org.apache.struts2.example.ajax.actions.UpdateQuantityInCart"/>
</package>
</xwork>
</struts>
apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
-14
View File
@@ -1,14 +0,0 @@
<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>
apps/showcase/src/main/resources/xwork-actionchaining.xml → apps/showcase/src/main/resources/struts-actionchaining.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-ajax.xml → apps/showcase/src/main/resources/struts-ajax.xml
+5 -3
View File
@@ -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>
apps/showcase/src/main/resources/xwork-chat.xml → apps/showcase/src/main/resources/struts-chat.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-continuations.xml → apps/showcase/src/main/resources/struts-continuations.xml
+5 -3
View File
@@ -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>
apps/showcase/src/main/resources/xwork-conversion.xml → apps/showcase/src/main/resources/struts-conversion.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-filedownload.xml → apps/showcase/src/main/resources/struts-filedownload.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-fileupload.xml → apps/showcase/src/main/resources/struts-fileupload.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-freemarker.xml → apps/showcase/src/main/resources/struts-freemarker.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-hangman.xml → apps/showcase/src/main/resources/struts-hangman.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/struts-jsf.xml
+34
View File
@@ -0,0 +1,34 @@
<!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" 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>
</struts>
apps/showcase/src/main/resources/xwork-model-driven.xml → apps/showcase/src/main/resources/struts-model-driven.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-person.xml → apps/showcase/src/main/resources/struts-person.xml
+5 -3
View File
@@ -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 -->
apps/showcase/src/main/resources/xwork-tags-non-ui.xml → apps/showcase/src/main/resources/struts-tags-non-ui.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-tags-ui.xml → apps/showcase/src/main/resources/struts-tags-ui.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/struts-tags.xml
+7
View File
@@ -0,0 +1,7 @@
<!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>
apps/showcase/src/main/resources/xwork-token.xml → apps/showcase/src/main/resources/struts-token.xml
+5 -3
View File
@@ -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>
apps/showcase/src/main/resources/xwork-validation.xml → apps/showcase/src/main/resources/struts-validation.xml
+5 -5
View File
@@ -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>
apps/showcase/src/main/resources/xwork-wait.xml → apps/showcase/src/main/resources/struts-wait.xml
+5 -3
View File
@@ -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>
apps/showcase/src/main/resources/xwork.xml → apps/showcase/src/main/resources/struts.xml
+21 -21
View File
@@ -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 -->
apps/showcase/src/main/resources/xwork-jsf.xml
-33
View File
@@ -1,33 +0,0 @@
<!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"/>
<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">
<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>
apps/showcase/src/main/resources/xwork-tags.xml
-5
View File
@@ -1,5 +0,0 @@
<!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>
apps/starter/src/main/webapp/WEB-INF/classes/xwork.xml → apps/starter/src/main/resources/struts.xml
+7 -3
View File
@@ -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>
apps/starter/src/main/resources/xwork.xml
-26
View File
@@ -1,26 +0,0 @@
<!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"/>
<package name="default" extends="struts-default">
<default-action-ref name="home" />
<action name="home" class="com.foo.example.HomeAction">
<result>/WEB-INF/pages/home.jsp</result>
</action>
<action name="helloMatrix" class="com.foo.example.HelloMatrixAction">
<result name="success">/WEB-INF/pages/hellomatrix.jsp</result>
</action>
<action name="helloMatrixSubmit" class="com.foo.example.HelloMatrixAction" method="sayHello">
<interceptor-ref name="validationWorkflowStack"/>
<result name="input">/WEB-INF/pages/hellomatrix.jsp</result>
<result name="error">/WEB-INF/pages/hellomatrix.jsp</result>
<result name="success" type="freemarker">/WEB-INF/pages/hellomatrix-success.ftl</result>
</action>
</package>
</xwork>
apps/starter/src/main/webapp/WEB-INF/classes/struts.properties
-2
View File
@@ -1,2 +0,0 @@
struts.objectFactory = spring
struts.devMode = true
core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
+7 -1
View File
@@ -215,7 +215,13 @@ public class DispatcherUtils {
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) {
core/src/main/resources/config-browser.xml
+7 -3
View File
@@ -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>
core/src/main/resources/struts-default.xml
+29 -4
View File
@@ -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>
core/src/main/resources/struts-jsf.xml
-29
View File
@@ -1,29 +0,0 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
<xwork>
<package name="struts-jsf">
<result-types>
<result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
</result-types>
<interceptors>
<!-- 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" />
<!-- 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>
</package>
</xwork>
core/src/main/resources/struts-portlet-default.xml
+8 -3
View File
@@ -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>
</struts>
core/src/test/resources/xwork.xml → core/src/test/resources/struts.xml
+5 -4
View File
@@ -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>