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 [39/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/test/DataAware-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="data">
+ <field-validator type="required">
+ <message>You must enter a value for data.</message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="data">
+ <field-validator type="requiredstring">
+ <message>You must enter a value for data.</message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,2 @@
+test.foo = Foo!
+test.bar = Bar!
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bling">
+ <field-validator type="requiredstring">
+ <message>You must enter a value for data.</message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,52 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="horse">
+ <field-validator type="requiredstring">
+ <param name="trim">false</param>
+ <message>noTrim</message>
+ </field-validator>
+ <field-validator type="requiredstring">
+ <param name="trim">true</param>
+ <message>trim</message>
+ </field-validator>
+ </field>
+
+ <field name="cow">
+ <field-validator type="stringlength">
+ <param name="trim">false</param>
+ <param name="minLength">5</param>
+ <message>noTrim-min5</message>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">false</param>
+ <param name="minLength">5</param>
+ <param name="maxLength">10</param>
+ <message>noTrim-min5-max10</message>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">false</param>
+ <param name="maxLength">10</param>
+ <message>noTrim-max10</message>
+ </field-validator>
+ </field>
+
+ <field name="donkey">
+ <field-validator type="stringlength">
+ <param name="trim">true</param>
+ <param name="minLength">5</param>
+ <message>trim-min5</message>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">true</param>
+ <param name="minLength">5</param>
+ <param name="maxLength">10</param>
+ <message>trim-min5-max10</message>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">true</param>
+ <param name="maxLength">10</param>
+ <message>trim-max10</message>
+ </field-validator>
+ </field>
+
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,13 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="count">
+ <field-validator type="required">
+ <message>You must enter a value for count.</message>
+ </field-validator>
+ <field-validator type="int">
+ <param name="min">0</param>
+ <param name="max">5</param>
+ <message>count must be between ${min} and ${max}, current value is ${count}.</message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,13 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="baz">
+ <field-validator type="required">
+ <message>You must enter a value for baz.</message>
+ </field-validator>
+ <field-validator type="int">
+ <param name="min">2</param>
+ <param name="max">4</param>
+ <message>baz out of range.</message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+cat = com.opensymphony.xwork2.conversion.impl.FooBarConverter
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,2 @@
+Collection_list = java.lang.String
+Collection_map = java.lang.String
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,38 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+ <field name="name">
+ <field-validator type="required">
+ <message key="name.key">You must enter a value for name.</message>
+ </field-validator>
+ </field>
+
+ <field name="email">
+ <field-validator type="email" short-circuit="true">
+ <message>Not a valid e-mail.</message>
+ </field-validator>
+ <field-validator type="fieldexpression">
+ <param name="expression">email.endsWith('mycompany.com')</param>
+ <message>Email not from the right company.</message>
+ </field-validator>
+ </field>
+
+ <field name="email2">
+ <field-validator type="email">
+ <message>Not a valid e-mail2.</message>
+ </field-validator>
+ <field-validator type="fieldexpression">
+ <param name="expression">email.endsWith('mycompany.com')</param>
+ <message>Email2 not from the right company.</message>
+ </field-validator>
+ </field>
+
+ <validator type="expression">
+ <param name="expression">email.startsWith('mark')</param>
+ <message>Email does not start with mark</message>
+ </validator>
+ <validator type="expression">
+ <param name="expression">email2.startsWith('mark')</param>
+ <message>Email2 does not start with mark</message>
+ </validator>
+
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,17 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+ <field name="email">
+ <field-validator type="required" short-circuit="true">
+ <message>You must enter a value for email.</message>
+ </field-validator>
+ </field>
+ <field name="email2">
+ <field-validator type="required" short-circuit="true">
+ <message>You must enter a value for email2.</message>
+ </field-validator>
+ </field>
+ <validator type="expression" short-circuit="true">
+ <param name="expression">email.equals(email2)</param>
+ <message>Email not the same as email2</message>
+ </validator>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/package.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/package.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/package.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/package.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+package.properties=It works!
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/package.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/test/package.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,2 @@
+title=Title:
+invalid.fieldvalue.title=Title is invalid!
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,2 @@
+Collection_kittens = com.opensymphony.xwork2.util.Cat
+foo.number = com.opensymphony.xwork2.conversion.impl.FooNumberConverter
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,2 @@
+bean.name=Haha you cant FindMe!
+bean2.name=Okay! You found Me!
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,11 @@
+bar=com.opensymphony.xwork2.conversion.impl.FooBarConverter
+Element_cats=com.opensymphony.xwork2.util.Cat
+Element_moreCats=com.opensymphony.xwork2.util.Cat
+Element_catMap=com.opensymphony.xwork2.util.Cat
+Key_anotherCatMap=java.lang.Long
+Element_anotherCatMap=com.opensymphony.xwork2.util.Cat
+KeyProperty_barCollection=id
+Element_barCollection=com.opensymphony.xwork2.util.Bar
+KeyProperty_barList=id
+Element_barList=com.opensymphony.xwork2.util.Bar
+
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,3 @@
+Element_longs = java.lang.Long
+Element_strings = java.lang.String
+Element_dates = java.util.Date
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,3 @@
+test.format.date={0,date,short}
+xw377=xw377
+username=Santa
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+KeyProperty_beanList=id
+Element_beanList=com.opensymphony.xwork2.util.MyBean
+CreateIfNull_beanList=true
+
+Key_beanMap=java.lang.Long
+KeyProperty_beanMap=id
+Element_beanMap=com.opensymphony.xwork2.util.MyBean
+
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+Collection_dogs = com.opensymphony.xwork2.util.Dog
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,3 @@
+# Do not create a default bundle, XW404 tests a condition where there are no default bundle
+
+hello=Hallo
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,3 @@
+# Do not create a default bundle, XW404 tests a condition where there are no default bundle
+
+hello=Bonjour
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<foo xmlns:loc="http://opensymphony.com/xwork/location"
+ loc:src="foo.xml"
+ loc:line="1"
+ loc:column="1">
+ <bar loc:src="foo.xml"
+ loc:line="5"
+ loc:column="6" />
+</foo>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,10 @@
+# common in both CompositeTextProviderTestResourceBundle1.properties
+# and CompositeTextProviderTestResourceBunlde2.properties
+name=1 name
+age=1 age
+goodnight=1 good night {0}
+goodmorning=1 good morning {0} and {1}
+
+# specific to CompositeTextProviderTestResourceBundle1.properties
+car=This is a car
+bike=This is a bike
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,11 @@
+# common in both CompositeTextProviderTestResourceBundle1.properties
+# and CompositeTextProviderTestResourceBunlde2.properties
+name=2 name
+age=2 age
+goodnight=2 good night {0}
+goodmorning=2 good morning {0} and {1}
+
+
+# specific to CompositeTextProviderTestResourceBundle2.properties
+cat=This is a cat
+dog=This is a dog
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,9 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="model">
+ <field-validator type="visitor">
+ <param name="appendPrefix">false</param>
+ <message>model: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="testBeanArray">
+ <field-validator type="visitor">
+ <message>testBeanArray: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="testBeanList">
+ <field-validator type="visitor">
+ <message>testBeanList: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="context">
+ <field-validator type="requiredstring">
+ <message>You must enter a context.</message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,9 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <param name="context">anotherContext</param>
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,33 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+ <field name="foo">
+ <field-validator type="required">
+ <message key="test.key">You must enter a value for foo.</message>
+ </field-validator>
+ </field>
+ <field name="bar">
+ <field-validator type="required" short-circuit="true">
+ <message key="bar.key">You must enter a value for bar.</message>
+ </field-validator>
+ <field-validator type="int">
+ <param name="min">6</param>
+ <param name="max">10</param>
+ <message>bar must be between ${min} and ${max}, current value is ${bar}.</message>
+ </field-validator>
+ <field-validator type="regex">
+ <param name="expression">
+ <!-- Some useless comment for the following expression, which should be ignored by parser -->
+ <![CDATA[([aAbBcCdD][123][eEfFgG][456])]]>
+ </param>
+ <message>bar must must match the given expression.</message>
+ </field-validator>
+ </field>
+ <validator type="expression">
+ <param name="expression">email.equals(email2)</param>
+ <message>Email not the same as email2</message>
+ </validator>
+ <validator type="expression" short-circuit="true">
+ <param name="expression">email.startsWith('mark')</param>
+ <message>Email does not start with mark</message>
+ </validator>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,17 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="myField">
+ <field-validator type="required">
+ <message>a field error message</message>
+ </field-validator>
+ </field>
+ <validator type="expression">
+ <param name="expression"><![CDATA[false]]></param>
+ <message>an expression error message</message>
+ </validator>
+</validators>
+
+
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,11 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+ <validator type="expression" bar="die">
+ <param name="expression">email.equals(email2)</param>
+ <message>Email not the same as email2</message>
+ </validator>
+ <validator type="expression" short-circuit="true">
+ <param name="expression">email.startsWith('mark')</param>
+ <message>Email does not start with mark</message>
+ </validator>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,12 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <validator type="expression">
+ <param name="expression">email.equals(email2)</param>
+ <message>Email not the same as email2</message>
+ </validator>
+ <validator type="expression" short-circuit="true">
+ <param name="expression">email.startsWith('mark')</param>
+ <message>Email does not start with mark</message>
+ </validator>
+/validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,4 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<validators>
+ <validator name="foo" class="bar" />
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,27 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.3//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd">
+
+<validators>
+ <field name="name">
+ <field-validator type="requiredstring">
+ <message key="error.name">default message 1</message>
+ </field-validator>
+ </field>
+ <field name="address">
+ <field-validator type="requiredstring">
+ <param name="trim">true</param>
+ <param name="anotherParam">anotherValue</param>
+ <message key="error.address"> ddddd
+ <param name="1">'tmjee'</param>
+ <param name="2">'phil'</param>
+ <param name="10">'jimmy'</param>
+ <param name="6">'hopkins'</param>
+ <param name="defaultMessage">The Default Message</param>
+ <param name="someNonsenseKey">Some Nonesense Value</param>
+ <param name="3">'rainer'</param>
+ </message>
+ </field-validator>
+ </field>
+</validators>
+
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+<!-- START SNIPPET: validators-default -->
+<validators>
+ <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator nameFail="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"/>
+ <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
+</validators>
+<!-- END SNIPPET: validators-default -->
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/includeTest.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/includeTest.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/includeTest.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/includeTest.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>
+ <package name="includeTest" extends="default" namespace="includeTest">
+ <action name="includeTest" class="com.opensymphony.xwork2.SimpleAction"></action>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/includeTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/includeTest.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/log4j.properties?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/log4j.properties (added)
+++ struts/xwork/trunk/core/src/test/resources/log4j.properties Sun Dec 27 18:00:13 2009
@@ -0,0 +1,17 @@
+log4j.rootLogger = WARN, stdout
+
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold = WARN
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] : %m%n
+
+# set to info to let the code be executed when doing unit test for this interceptor
+log4j.category.com.opensymphony.xwork2.interceptor.LoggingInterceptor=INFO
+log4j.category.com.opensymphony.xwork2.interceptor.TimerInterceptor=INFO
+
+# set to debug to let the code be executed when doing unit test for this interceptor
+log4j.category.com.opensymphony.xwork2.interceptor.ParametersInterceptor=DEBUG
+
+# set to debug for testing timer interceptor with custom log category
+log4j.category.com.mycompany.myapp.actiontiming=DEBUG
Propchange: struts/xwork/trunk/core/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/my-validators.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/my-validators.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/my-validators.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/my-validators.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+<validators>
+ <validator name="requiredAdditional" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/my-validators.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/my-validators.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/myOther-validators.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/myOther-validators.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/myOther-validators.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/myOther-validators.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+<validators>
+ <validator name="requiredAnother" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/myOther-validators.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/myOther-validators.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/validators.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/validators.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/validators.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+<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"/>
+ <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
+ <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
+</validators>
Propchange: struts/xwork/trunk/core/src/test/resources/validators.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/validators.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/xwork - jar.jar
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork%20-%20jar.jar?rev=894087&view=auto
==============================================================================
Binary file - no diff available.
Propchange: struts/xwork/trunk/core/src/test/resources/xwork - jar.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: struts/xwork/trunk/core/src/test/resources/xwork - zip.zip
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork%20-%20zip.zip?rev=894087&view=auto
==============================================================================
Binary file - no diff available.
Propchange: struts/xwork/trunk/core/src/test/resources/xwork - zip.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: struts/xwork/trunk/core/src/test/resources/xwork-1.0.dtd
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork-1.0.dtd?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/xwork-1.0.dtd (added)
+++ struts/xwork/trunk/core/src/test/resources/xwork-1.0.dtd Sun Dec 27 18:00:13 2009
@@ -0,0 +1 @@
+Duplicate file test
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-1.0.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-1.0.dtd
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/xwork-jar.jar
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork-jar.jar?rev=894087&view=auto
==============================================================================
Binary file - no diff available.
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-jar.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: struts/xwork/trunk/core/src/test/resources/xwork-proxyinvoke.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork-proxyinvoke.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/xwork-proxyinvoke.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/xwork-proxyinvoke.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,46 @@
+<!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" name="default" class="com.opensymphony.xwork2.ProxyObjectFactory" />
+
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
+ <constant name="devMode" value="false" />
+
+ <package name="xwork-test-default">
+ <result-types>
+ <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
+ <result-type name="void" class="com.opensymphony.xwork2.VoidResult"/>
+ <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
+ </result-types>
+
+ <interceptors>
+ <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="chain" class="com.opensymphony.xwork2.interceptor.ChainingInterceptor"/>
+ <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
+ <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="modelDriven" class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="validation" class="com.opensymphony.xwork2.validator.ValidationInterceptor"/>
+ <interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/>
+ <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <param name="foo">expectedFoo</param>
+ </interceptor>
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="staticParams"/>
+ <interceptor-ref name="modelDriven"/>
+ <interceptor-ref name="params"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="debugStack">
+ <interceptor-ref name="timer"/>
+ <interceptor-ref name="logger"/>
+ </interceptor-stack>
+ </interceptors>
+ </package>
+
+ <package name="default" extends="xwork-test-default">
+
+ <action name="ProxyInvocation" method="show" class="com.opensymphony.xwork2.ProxyInvocationAction"/>
+ </package>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-proxyinvoke.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-proxyinvoke.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/xwork-sample.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork-sample.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/xwork-sample.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/xwork-sample.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,238 @@
+<!DOCTYPE xwork PUBLIC
+ "-//OpenSymphony Group//XWork 2.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-2.0.dtd"
+ >
+ <!-- "file:///temp/ross/xwork/src/etc/xwork-1.0.dtd" -->
+
+<xwork>
+ <include file="xwork-test-default.xml"/>
+ <package name="default" extends="xwork-test-default">
+
+ <global-results>
+ <result name="login"> <!-- should be chain type since it is the default -->
+ <param name="actionName">login</param>
+ </result>
+ </global-results>
+
+ <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>
+
+ <action name="WildCard" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <result name="success" type="void" />
+ <result name="*" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="WildCardInput" class="com.opensymphony.xwork2.SimpleAction" method="input">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <result name="success" type="void" />
+ <result name="*" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="WildCardError" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="void" />
+ <result name="*" type="mock" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="WildCard/*/*" class="com.opensymphony.xwork2.{1}Action"
+ method="{2}">
+ <param name="foo">{1}</param>
+ <param name="bar">{2}</param>
+ <result name="success" type="void" />
+ <interceptor-ref name="defaultStack"/>
+ </action>
+
+ <action name="aliasTest" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="aliases">#{ "aliasSource" : "aliasDest", "bar":"baz" }</param>
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="alias"/>
+ <result name="success" type="mock" />
+ </action>
+
+ <action name="packagelessAction" class="PackagelessAction">
+ </action>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">17</param>
+ <param name="bar">23</param>
+ <result name="error" type="mock" />
+ </action>
+
+ <action name="MyBean" class="com.opensymphony.xwork2.util.MyBeanAction">
+ <interceptor-ref name="debugStack"/>
+ <interceptor-ref name="defaultStack"/>
+ <result name="success" type="mock" />
+ </action>
+
+ <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="expectedFoo">expectedFoo</param>
+ </interceptor-ref>
+ <result name="error" type="mock" />
+ </action>
+
+ <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="foo">foo123</param>
+ <param name="expectedFoo">foo123</param>
+ </interceptor-ref>
+ <result name="error" type="mock" />
+ </action>
+
+ <action name="TestModelDrivenValidation" class="com.opensymphony.xwork2.ModelDrivenAction">
+ <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="validation"/>
+ <result name="success" type="mock" />
+ </action>
+
+ <!-- chain resursion detection -->
+ <action name="InfiniteRecursionChain" class="com.opensymphony.xwork2.ActionSupport">
+ <result name="success" type="chain">InfiniteRecursionChain</result>
+ </action>
+
+ </package>
+
+ <package name="bar" extends="default" namespace="/foo/bar">
+ <interceptors>
+ <interceptor-stack name="barDefaultStack">
+ <interceptor-ref name="debugStack"/>
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <global-exception-mappings>
+ <exception-mapping name="foo" exception="com.opensymphony.TestException" result="foo"/>
+ </global-exception-mappings>
+
+ <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="barDefaultStack"/>
+ <result name="error" type="mock" />
+ </action>
+
+ <action name="TestInterceptorParamInheritance" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="expectedFoo">expectedFoo</param>
+ </interceptor-ref>
+ <result name="error" type="mock" />
+ </action>
+
+ <action name="TestInterceptorParamInehritanceOverride" class="com.opensymphony.xwork2.SimpleAction">
+ <interceptor-ref name="test">
+ <param name="foo">foo123</param>
+ <param name="expectedFoo">foo123</param>
+ </interceptor-ref>
+ <result name="error" type="mock" />
+ </action>
+ </package>
+
+ <package name="abstractPackage" namespace="/abstract" abstract="true">
+ <action name="test" class="com.opensymphony.xwork2.SimpleAction"/>
+ </package>
+
+ <package name="nonAbstractPackage" extends="abstractPackage" namespace="/nonAbstract"/>
+
+ <package name="baz" extends="default" namespace="baz">
+ <action name="commandTest" class="com.opensymphony.xwork2.SimpleAction">
+ <param name="foo">123</param>
+ <result name="error" type="chain">
+ <param name="actionName">bar</param>
+ </result>
+ <result name="success" type="mock" />
+ <interceptor-ref name="staticParams"/>
+ </action>
+ <action name="myCommand" class="com.opensymphony.xwork2.SimpleAction" method="commandMethod">
+ <param name="bar">456</param>
+ <result name="success" type="chain">
+ <param name="actionName">foo</param>
+ </result>
+ <result name="com.opensymphony.xwork2.SimpleAction.CommandInvoked" type="mock"/>
+ <interceptor-ref name="logger"/>
+ </action>
+ <action name="doMethodTest" class="com.opensymphony.xwork2.SimpleAction" method="input">
+ <result name="input" type="mock" />
+ </action>
+ <action name="unknownMethodTest" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="found" type="mock" />
+ </action>
+ <action name="resultAction" class="com.opensymphony.xwork2.SimpleAction" method="resultAction">
+ <param name="bar">456</param>
+ <result name="success" type="chain">
+ <param name="actionName">foo</param>
+ </result>
+ <interceptor-ref name="logger"/>
+ </action>
+ </package>
+
+ <package name="wildcardNamespaces" extends="default" namespace="/animals/*">
+ <action name="commandTest" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="mock" />
+ <interceptor-ref name="staticParams"/>
+ </action>
+ </package>
+
+ <package name="multipleInheritance" extends="default,abstractPackage,bar" namespace="multipleInheritance">
+ <action name="testMultipleInheritance" class="com.opensymphony.xwork2.SimpleAction">
+ <result name="success" type="chain">
+ <param name="actionName">foo</param>
+ </result>
+ <interceptor-ref name="barDefaultStack"/>
+ </action>
+ </package>
+
+
+ <package name="Abstract-crud" extends="default">
+ <!-- edit is often used as the create/view -->
+ <default-class-ref class="com.opensymphony.xwork2.SimpleAction"/>
+ <action name="edit" >
+ <result name="input" type="mock">edit.vm</result>
+ <result name="success" type="mock">edit.vm</result>
+ <result name="error" type="mock">edit.vm</result>
+ </action>
+ <action name="save" >
+ <result name="input" type="mock">edit.vm</result>
+ <result name="success" type="chain">list</result>
+ <result name="error" type="mock">edit.vm</result>
+ <result name="cancel" type="mock">list.action</result>
+ </action>
+ <action name="list">
+ <result name="success" type="mock">list</result>
+ </action>
+ <action name="delete">
+ <result name="success" type="mock">list</result>
+ </action>
+
+ </package>
+
+ <package name="Example" extends="Abstract-crud" namespace="/example">
+ <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
+ </package>
+
+ <package name="Example2" extends="Abstract-crud" namespace="/example2">
+ <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
+ <action name="override">
+ <result name="success" type="mock">somethingelse.vm</result>
+ </action>
+ </package>
+
+ <package name="SubItem" extends="Abstract-crud" namespace="/example2/subItem">
+ <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
+ </package>
+
+ <package name="Example3" extends="Abstract-crud" namespace="/example3">
+ <!-- default-class-ref is expected to be inherited -->
+ </package>
+
+ <include file="includeTest.xml"/>
+</xwork>
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-sample.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-sample.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/xwork/trunk/core/src/test/resources/xwork-test-beans.xml
URL: http://svn.apache.org/viewvc/struts/xwork/trunk/core/src/test/resources/xwork-test-beans.xml?rev=894087&view=auto
==============================================================================
--- struts/xwork/trunk/core/src/test/resources/xwork-test-beans.xml (added)
+++ struts/xwork/trunk/core/src/test/resources/xwork-test-beans.xml Sun Dec 27 18:00:13 2009
@@ -0,0 +1,25 @@
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 2.0//EN" "http://www.opensymphony.com/xwork/xwork-2.0.dtd">
+
+<xwork>
+<!--
+ <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
+ <constant name="devMode" value="false" />
+
+ <bean type="com.opensymphony.xwork2.util.ValueStackFactory"
+ class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
+ <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
+ class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
+ <bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory"
+ class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
+ <bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
+ <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
+ class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer" />
+-->
+ <!-- static injections -->
+ <!--
+ <bean class="com.opensymphony.xwork2.ognl.OgnlValueStack" static="true"/>
+ <bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" static="true"/>
+ <bean class="com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory" static="true" />
+ -->
+</xwork>
\ No newline at end of file
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-test-beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/xwork/trunk/core/src/test/resources/xwork-test-beans.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL