You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ma...@apache.org on 2009/12/27 19:01:09 UTC
svn commit: r894087 [38/46] - in /struts/xwork/trunk: ./ assembly/
assembly/src/ assembly/src/main/ assembly/src/main/assembly/
assembly/src/main/resources/ core/ core/src/ core/src/main/
core/src/main/java/ core/src/main/java/com/ core/src/main/java/c...
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,7 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.1.3//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.1.3.dtd"
+ >
+
+<xwork order="3">
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,7 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.1.3//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.1.3.dtd"
+ >
+
+<xwork order="1">
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-%20test.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,81 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <param name="foo">fooDefault</param>
+ </interceptor>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="timer"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <global-results>
+ <result name="login"> <!-- should be chain type since it is the default -->
+ <param name="actionName">login</param>
+ </result>
+ </global-results>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <param name="testXW412">foo.jspa?fooID=${fooID}&something=bar</param>
+ <param name="testXW412Again">
+ something
+ </param>
+ <param name="testForXW171"></param>
+ </action>
+
+ <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">18</param>
+ <param name="bar">24</param>
+ <result name="success" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="WildCard" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="*" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="FooBar" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">18</param>
+ <param name="bar">24</param>
+ <result name="success" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ <exception-mapping name="runtime" exception="java.lang.RuntimeException" result="exception"/>
+ </action>
+
+ <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="expectedFoo">expectedFooValue</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="foo">foo123</param>
+ <param name="expectedFoo">expectedFooValue</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="BarWithoutClassName">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ </action>
+
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,14 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <package name="namespace5" extends="namespace4" namespace="/namespace5">
+ <action name="action5" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ </action>
+ </package>
+
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,20 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <package name="namespace4" extends="namespace1" namespace="/namespace4">
+ <interceptors>
+ <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ </interceptors>
+
+ <action name="action4" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ </action>
+ </package>
+
+
+ <include file="com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml" />
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,14 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <package name="namespace2" extends="namespace1" namespace="/namespace2">
+ <action name="action2" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ </action>
+ </package>
+
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,22 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+
+ <package name="namespace1" extends="default" namespace="/namespace1">
+ <interceptors>
+ <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ </interceptors>
+
+ <action name="action1" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ </action>
+ </package>
+
+ <include file="com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml" />
+
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,22 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-default.xml" />
+
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ </result-types>
+ <interceptors>
+ <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
+ </interceptors>
+ </package>
+
+ <include file="com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml" />
+
+
+ <include file="com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml" />
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,23 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+
+ <action name="Foo" class="com.opensymphony.xwork2.config.providers.PrivateConstructorAction">
+ <param name="foo">13</param>
+ </action>
+
+ <action name="Bar" class="com.opensymphony.xwork2.config.providers.NoNoArgsConstructorAction">
+ <param name="bar">17</param>
+ </action>
+
+ <action name="FooBar" class="com.opensymphony.xwork2.config.providers.IDoNotExistAction">
+ <param name="foobar">17</param>
+ </action>
+
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,41 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <package name="default">
+
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <param name="foo">fooDefault</param>
+ </interceptor>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="timer"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <default-class-ref class="com.opensymphony.xwork2.UserSpecifiedDefaultAction" />
+
+ <global-results>
+ <result name="login"> <!-- should be chain type since it is the default -->
+ <param name="actionName">login</param>
+ </result>
+ </global-results>
+
+ <!-- No class spcified for action. This should use the default-class-ref -->
+ <action name="Bar">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <param name="testForXW171"></param>
+ </action>
+ </package>
+</xwork>
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,81 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <param name="foo">fooDefault</param>
+ </interceptor>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="timer"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <global-results>
+ <result name="login"> <!-- should be chain type since it is the default -->
+ <param name="actionName">login</param>
+ </result>
+ </global-results>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <param name="testXW412">foo.jspa?fooID=${fooID}&something=bar</param>
+ <param name="testXW412Again">
+ something
+ </param>
+ <param name="testForXW171"></param>
+ </action>
+
+ <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">18</param>
+ <param name="bar">24</param>
+ <result name="success" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="WildCard" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="*" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="FooBar" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">18</param>
+ <param name="bar">24</param>
+ <result name="success" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ <exception-mapping name="runtime" exception="java.lang.RuntimeException" result="exception"/>
+ </action>
+
+ <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="expectedFoo">expectedFooValue</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="foo">foo123</param>
+ <param name="expectedFoo">expectedFooValue</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="BarWithoutClassName">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ </action>
+
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,17 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default" />
+
+ <package name="badPackage" extends="nonexistentPackage"/>
+
+ <package name="circularPackage" extends="circularPackage"/>
+
+ <package name="anotherCircularPackage" extends="anotherCircularPackage2"/>
+
+ <package name="anotherCircularPackage2" extends="anotherCircularPackage"/>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,13 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default" />
+
+ <package name="namespacepkg" namespace="/namespace/set" />
+
+ <package name="abstractpkg" abstract="true" />
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +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="xwork-test-beans.xml" />
+ <package name="default" />
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,11 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+
+<xwork>
+ <package name="hasDefaultClassRef">
+ <default-class-ref class="com.opensymphony.xwork2.ActionSupport" />
+ </package>
+ <package name="noDefaultClassRef"/>
+</xwork>
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,33 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <global-results>
+ <!-- should be chain type since it is the default -->
+ <result name="login">login</result>
+ </global-results>
+
+ <global-exception-mappings>
+ <exception-mapping exception="java.lang.RuntimeException" result="runForDeeHillz"/>
+ <exception-mapping exception="com.opensymphony.xwork2.XworkException" result="xworkNaughty"/>
+ </global-exception-mappings>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <exception-mapping exception="com.opensymphony.xwork2.SpookyException" result="spooky-result"/>
+ <result name="spooky-result" type="mock"/>
+ <result name="specificLocationResult">
+ <param name="actionName">bar.vm</param>
+ </result>
+ </action>
+
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +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"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="parent" namespace="/base">
+ <result-types>
+ <result-type name="mockResult" class="com.opensymphony.xwork2.mock.MockResult" />
+ </result-types>
+ <global-results>
+ <result name="mockResult1" type="mockResult">
+ <param name="identity">p1</param>
+ </result>
+ <result name="mockResult2" type="mockResult">
+ <param name="identity">p2</param>
+ </result>
+ </global-results>
+ <action name="parentAction" />
+ </package>
+
+
+ <package name="another" namespace="/base">
+ <result-types>
+ <result-type name="anotherMockResult" class="com.opensymphony.xwork2.mock.MockResult" />
+ </result-types>
+ <global-results>
+ <result name="mockResult1" type="anotherMockResult">
+ <param name="identity">a1</param>
+ </result>
+ <result name="mockResult2" type="anotherMockResult">
+ <param name="identity">a2</param>
+ </result>
+ </global-results>
+ <action name="anotherAction" />
+ </package>
+
+ <package name="child" extends="parent" namespace="/base">
+ <global-results>
+ <result name="mockResult1" type="mockResult">
+ <param name="identity">c1</param>
+ </result>
+ </global-results>
+ <action name="childAction" />
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,30 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <!-- this package has a default interceptor ref - so actions with no refs should have the default ref -->
+ <package name="default">
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
+ </interceptors>
+
+ <default-interceptor-ref name="timer" />
+ <action name="ActionWithOwnRef" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="logging"/>
+ </action>
+ <action name="ActionWithDefaultRef" class="com.opensymphony.xwork2.SimpleAction" />
+ </package>
+
+ <!-- this package has no default interceptor ref - so actions with no refs should inherit the default interceptor -->
+ <!-- this tests that default interceptor refs are inherited -->
+ <package name="subpackage" extends="default">
+ <action name="ActionWithNoRef" class="com.opensymphony.xwork2.SimpleAction" />
+
+ <action name="AnotherActionWithOwnRef" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="logging"/>
+ </action>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +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="xwork-test-beans.xml" />
+ <package name="default">
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="timer"/>
+ </interceptor-stack>
+ </interceptors>
+ </package>
+
+ <package name="subPackage" extends="default">
+ <interceptors>
+ <interceptor-stack name="subDefaultStack">
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+ </interceptors>
+ </package>
+
+ <package name="subSubPackage" extends="subPackage">
+ <interceptors>
+ <interceptor-stack name="subSubDefaultStack">
+ <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="subDefaultStack"/>
+ </interceptor-stack>
+ </interceptors>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,44 @@
+<?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">
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="packageOne">
+ <result-types>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult" />
+ </result-types>
+
+ <interceptors>
+ <interceptor name="interceptorOne" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
+ <interceptor name="interceptorTwo" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
+ <interceptor name="interceptorThree" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
+
+ <interceptor-stack name="stackOne">
+ <interceptor-ref name="interceptorOne" />
+ <interceptor-ref name="interceptorTwo" />
+ <interceptor-ref name="interceptorThree" />
+ </interceptor-stack>
+ </interceptors>
+
+ <action name="actionOne">
+ <interceptor-ref name="stackOne">
+ <param name="interceptorOne.paramOne">i1p1</param>
+ <param name="interceptorOne.paramTwo">i1p2</param>
+ <param name="interceptorTwo.paramOne">i2p1</param>
+ </interceptor-ref>
+ <result name="success" type="mock">test1</result>
+ </action>
+
+ <action name="actionTwo">
+ <interceptor-ref name="stackOne">
+ <param name="interceptorThree.paramOne">i3p1</param>
+ <param name="interceptorThree.paramTwo">i3p2</param>
+ <param name="interceptorTwo.paramTwo">i2p2</param>
+ </interceptor-ref>
+ <result name="success" type="mock">test2</result>
+ </action>
+ </package>
+</xwork>
+
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,37 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <param name="foo">fooDefault</param>
+ </interceptor>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="timer"/>
+ <interceptor-ref name="test"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <default-interceptor-ref name="defaultStack" />
+
+ <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="defaultStack">
+ <param name="test.expectedFoo">expectedFooValue</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="defaultStack">
+ <param name="test.foo">foo123</param>
+ <param name="test.expectedFoo">expectedFooValue2</param>
+ </interceptor-ref>
+ </action>
+ </package>
+
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd">
+
+<xwork>
+ <package name="packageOne">
+ <result-types>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult" />
+ </result-types>
+
+ <interceptors>
+ <interceptor name="interceptorOne" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
+ <interceptor name="interceptorTwo" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
+ <interceptor name="interceptorThree" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
+
+ <interceptor-stack name="stackOne">
+ <interceptor-ref name="interceptorOne" />
+ <interceptor-ref name="interceptorTwo" />
+ <interceptor-ref name="interceptorThree" />
+ </interceptor-stack>
+
+ <interceptor-stack name="stackTwo">
+ <interceptor-ref name="stackOne" />
+ </interceptor-stack>
+
+ <interceptor-stack name="stackThree">
+ <interceptor-ref name="stackTwo" />
+ </interceptor-stack>
+
+ </interceptors>
+
+ <action name="actionOne">
+ <interceptor-ref name="stackTwo">
+ <param name="stackOne.interceptorOne.paramOne">i1p1</param>
+ <param name="stackOne.interceptorOne.paramTwo">i1p2</param>
+ <param name="stackOne.interceptorTwo.paramOne">i2p1</param>
+ </interceptor-ref>
+ <result name="success" type="mock">test1</result>
+ </action>
+
+ <action name="actionTwo">
+ <interceptor-ref name="stackThree">
+ <param name="stackTwo.stackOne.interceptorThree.paramOne">i3p1</param>
+ <param name="stackTwo.stackOne.interceptorThree.paramTwo">i3p2</param>
+ <param name="stackTwo.stackOne.interceptorTwo.paramTwo">i2p2</param>
+ </interceptor-ref>
+ <result name="success" type="mock">test2</result>
+ </action>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,27 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <param name="foo">expectedFoo</param>
+ </interceptor>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="timer"/>
+ <interceptor-ref name="test"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="derivativeStack">
+ <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="logging"/>
+ </interceptor-stack>
+ </interceptors>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,13 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <interceptors>
+ <interceptor name="timer" class="timer-interceptor"/>
+ </interceptors>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,9 @@
+ <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <result name="success" type="chain">
+ <param name="actionName">Bar</param>
+ </result>
+ <interceptor-ref name="debugStack"/>
+ <interceptor-ref name="defaultStack"/>
+ </action>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,45 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ </result-types>
+ <interceptors>
+ <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
+ </interceptors>
+ </package>
+
+ <package name="namespace1" extends="default" namespace="/namespace1">
+ <interceptors>
+ <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ </interceptors>
+
+ <action name="action1" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ </action>
+ </package>
+
+
+ <package name="namespace2" extends="namespace1" namespace="/namespace2">
+ <action name="action2" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ </action>
+ </package>
+
+ <package name="namespace3" extends="namespace2" namespace="/namespace3">
+ <action name="action3" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain"/>
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="staticParams"/>
+ </action>
+ </package>
+
+</xwork>
+
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,23 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default" namespace="/default">
+ <action name="default" class="com.opensymphony.xwork2.ActionSupport"/>
+ </package>
+
+ <package name="abstractPackage" abstract="true">
+ <action name="abstract" class="com.opensymphony.xwork2.ActionSupport"/>
+ </package>
+
+ <package name="singleInheritance" namespace="/single" extends="default">
+ <action name="single" class="com.opensymphony.xwork2.ActionSupport"/>
+ </package>
+
+ <package name="multipleInheritance" namespace="/multiple" extends="default,abstractPackage,singleInheritance">
+ <action name="multiple" class="com.opensymphony.xwork2.ActionSupport"/>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,26 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true" />
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+ </package>
+
+ <package name="subPackage" extends="default">
+ <result-types>
+ <result-type name="subMock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="chainDefaultTypedResult" />
+ <result name="mockTypedResult" type="mock" />
+ <result name="subMockTypedResult" type="subMock" />
+ </action>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,54 @@
+<?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">
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="xworkResultTypesTestPackage1">
+ <result-types>
+ <result-type name="result1" class="com.opensymphony.xwork2.mock.MockResult" >
+ <param name="param1">value1</param>
+ <param name="param2">value2</param>
+ <param name="param3">value3</param>
+ </result-type>
+ <result-type name="result2" class="com.opensymphony.xwork2.mock.MockResult">
+ <param name="paramA">valueA</param>
+ <param name="paramB">valueB</param>
+ </result-type>
+ </result-types>
+ </package>
+
+
+ <package name="xworkResultTypesTestPackage2">
+ <result-types>
+ <result-type name="result1" class="com.opensymphony.xwork2.mock.MockResult" >
+ <param name="param1">value1</param>
+ <param name="param2">value2</param>
+ <param name="param3">value3</param>
+ </result-type>
+ <result-type name="result2" class="com.opensymphony.xwork2.mock.MockResult">
+ <param name="paramA">valueA</param>
+ <param name="paramB">valueB</param>
+ </result-type>
+ </result-types>
+
+ <action name="action1">
+ <result name="success" type="result1">
+ <param name="param1">newValue1</param>
+ <param name="param3">newValue3</param>
+ <param name="param10">value10</param>
+ <param name="param11">value11</param>
+ </result>
+ </action>
+
+ <action name="action2">
+ <result name="success" type="result2">
+ <param name="paramB">newValueB</param>
+ <param name="paramZ">valueZ</param>
+ </result>
+ </action>
+ </package>
+
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,32 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <global-results>
+ <!-- should be chain type since it is the default -->
+ <result name="login">login</result>
+ </global-results>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="chainDefaultTypedResult" />
+ <result name="mockTypedResult" type="mock" />
+ <result name="specificLocationResult">
+ <param name="actionName">bar.vm</param>
+ </result>
+ <result name="defaultLocationResult">foo.vm</result>
+ <result name="noDefaultLocationResult"> <!-- this will have only one param, named foo -->
+ foo.vm
+ <param name="foo">bar</param>
+ </result>
+ </action>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <package name="default-1" />
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <package name="default-2" />
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,10 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 1.1.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
+ >
+
+<xwork>
+ <include file="xwork-test-beans.xml" />
+ <include file="com/opensymphony/xwork2/config/providers/xwork-test-wildcard-*.xml" />
+ <package name="default-wildcard" />
+</xwork>
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,12 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.1.dtd"
+ >
+
+<xwork>
+ <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
+ <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
+
+ <unknown-handler-stack>
+ </unknown-handler-stack>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,14 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.1//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.1.dtd"
+ >
+
+<xwork>
+ <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
+ <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
+
+ <unknown-handler-stack>
+ <unknown-handler-ref name="uh1" />
+ <unknown-handler-ref name="uh2" />
+ </unknown-handler-stack>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+com.opensymphony.xwork2.util.Bar=com.opensymphony.xwork2.conversion.impl.FooBarConverter
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/somefile.txt
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/somefile.txt?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/somefile.txt (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/somefile.txt Sun Dec 27 18:00:13 2009
@@ -0,0 +1,9 @@
+this
+is
+a
+file
+of
+great
+import
+or
+something
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/somefile.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/somefile.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+ <bean id="simple-action" class="com.opensymphony.xwork2.SimpleAction" singleton="false"/>
+
+ <bean id="dependency-action" class="com.opensymphony.xwork2.SimpleAction" singleton="false">
+ <property name="blah"><value>injected</value></property>
+ </bean>
+
+ <bean id="execute-interceptor" class="com.opensymphony.xwork2.spring.ExecuteInterceptor"/>
+
+ <bean id="proxied-action" class="org.springframework.aop.framework.ProxyFactoryBean">
+ <property name="singleton"><value>false</value></property>
+ <property name="proxyTargetClass"><value>true</value></property>
+ <property name="interceptorNames">
+ <list>
+ <value>execute-interceptor</value>
+ <!-- When "singleton" is false, the target appears to be required here to
+ ensure that the config works as it should -->
+ <value>simple-action</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="auto-proxied-action" class="com.opensymphony.xwork2.SimpleAction" singleton="false"/>
+
+ <bean id="xwork-actions-proxy-creator" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
+ <property name="proxyTargetClass"><value>true</value></property>
+ <property name="interceptorNames">
+ <list>
+ <value>execute-interceptor</value>
+ </list>
+ </property>
+ <property name="beanNames"><value>auto-proxied-action</value></property>
+ </bean>
+
+ <bean id="springResult" class="com.opensymphony.xwork2.spring.SpringResult"
+ init-method="initialize">
+ <property name="stringParameter" value="my string"/>
+ </bean>
+</beans>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,23 @@
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 2.0//EN" "http://www.opensymphony.com/xwork/xwork-2.0.dtd">
+<xwork>
+ <bean type="com.opensymphony.xwork2.ObjectFactory" class="com.opensymphony.xwork2.spring.SpringObjectFactory" />
+ <constant name="applicationContextPath" value="com/opensymphony/xwork2/spring/actionContext-spring.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="null" class="com.opensymphony.xwork2.mock.MockResult" default="true"/>
+ <result-type name="springResult" class="springResult" />
+ </result-types>
+
+ <action name="simpleAction" class="simple-action"/>
+
+ <action name="dependencyAction" class="dependency-action"/>
+
+ <action name="proxiedAction" class="proxied-action"/>
+
+ <action name="autoProxiedAction" class="auto-proxied-action"/>
+
+ <action name="simpleActionSpringResult" class="simple-action">
+ <result name="error" type="springResult"/>
+ </action>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+ <bean id="spring-object-factory" class="com.opensymphony.xwork2.spring.SpringObjectFactory" init-method="initObjectFactory"/>
+</beans>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+ <bean id="myFoo" class="com.opensymphony.xwork2.spring.Foo">
+ <property name="name"><value>Little Foo</value></property>
+ </bean>
+ <bean id="myBar" class="com.opensymphony.xwork2.spring.Bar" autowire="byType">
+ <property name="value"><value>16</value></property>
+ </bean>
+</beans>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,22 @@
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 2.0//EN" "http://www.opensymphony.com/xwork/xwork-2.0.dtd">
+<xwork>
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory" />
+ <bean type="com.opensymphony.xwork2.ObjectFactory" name="default" class="com.opensymphony.xwork2.spring.SpringObjectFactory" />
+ <constant name="applicationContextPath" value="com/opensymphony/xwork2/spring/actionContext-spring.xml" />
+ <package name="default">
+ <result-types>
+ <result-type name="null"
+class="com.opensymphony.xwork2.result.NullResult" default="true"/>
+ </result-types>
+
+ <interceptors>
+ <interceptor name="autowire" class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor">
+ <param name="autowireStrategy">@org.springframework.beans.factory.config.AutowireCapableBeanFactory@AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE</param>
+ </interceptor>
+ </interceptors>
+
+ <default-interceptor-ref name="autowire"/>
+
+ <action name="simpleAction" class="com.opensymphony.xwork2.SimpleAction"/>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+xwork.error.action.execution=Testing resource bundle override
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+barObj=com.opensymphony.xwork2.conversion.impl.FooBarConverter
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL