You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/02 17:33:45 UTC
svn commit: r1209569 [50/50] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mai...
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/User-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/User-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/User-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/User-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,38 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/UserMarker-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/UserMarker-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/UserMarker-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/UserMarker-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,17 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/package.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/package.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/package.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/test/package.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1 @@
+package.properties=It works!
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Bar.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Bar.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Bar.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Bar.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,2 @@
+title=Title:
+invalid.fieldvalue.title=Title is invalid!
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Cat-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Cat-conversion.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Cat-conversion.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Cat-conversion.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,2 @@
+Collection_kittens = org.apache.struts2.xwork2.util.Cat
+foo.number = org.apache.struts2.xwork2.conversion.impl.FooNumberConverter
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/FindMe.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/FindMe.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/FindMe.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/FindMe.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,2 @@
+bean.name=Haha you cant FindMe!
+bean2.name=Okay! You found Me!
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Foo-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Foo-conversion.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Foo-conversion.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Foo-conversion.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,11 @@
+bar=org.apache.struts2.xwork2.conversion.impl.FooBarConverter
+Element_cats=org.apache.struts2.xwork2.util.Cat
+Element_moreCats=org.apache.struts2.xwork2.util.Cat
+Element_catMap=org.apache.struts2.xwork2.util.Cat
+Key_anotherCatMap=java.lang.Long
+Element_anotherCatMap=org.apache.struts2.xwork2.util.Cat
+KeyProperty_barCollection=id
+Element_barCollection=org.apache.struts2.xwork2.util.Bar
+KeyProperty_barList=id
+Element_barList=org.apache.struts2.xwork2.util.Bar
+
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/ListHolder-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/ListHolder-conversion.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/ListHolder-conversion.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/ListHolder-conversion.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,3 @@
+Element_longs = java.lang.Long
+Element_strings = java.lang.String
+Element_dates = java.util.Date
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/LocalizedTextUtilTest.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/LocalizedTextUtilTest.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/LocalizedTextUtilTest.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/LocalizedTextUtilTest.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,3 @@
+test.format.date={0,date,short}
+xw377=xw377
+username=Santa
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/MyBeanAction-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/MyBeanAction-conversion.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/MyBeanAction-conversion.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/MyBeanAction-conversion.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+KeyProperty_beanList=id
+Element_beanList=org.apache.struts2.xwork2.util.MyBean
+CreateIfNull_beanList=true
+
+Key_beanMap=java.lang.Long
+KeyProperty_beanMap=id
+Element_beanMap=org.apache.struts2.xwork2.util.MyBean
+
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Tiger-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Tiger-conversion.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Tiger-conversion.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/Tiger-conversion.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1 @@
+Collection_dogs = org.apache.struts2.xwork2.util.Dog
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_de.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_de.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_de.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_de.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,3 @@
+# Do not create a default bundle, XW404 tests a condition where there are no default bundle
+
+hello=Hallo
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_fr.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_fr.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_fr.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/XW404_fr.properties Fri Dec 2 16:33:03 2011
@@ -0,0 +1,3 @@
+# Do not create a default bundle, XW404 tests a condition where there are no default bundle
+
+hello=Bonjour
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/location/xml-with-location.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/location/xml-with-location.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/location/xml-with-location.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/util/location/xml-with-location.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<foo xmlns:loc="http://struts.apache.org/xwork/location"
+ loc:src="foo.xml"
+ loc:line="1"
+ loc:column="1">
+ <bar loc:src="foo.xml"
+ loc:line="5"
+ loc:column="6" />
+</foo>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties Fri Dec 2 16:33:03 2011
@@ -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
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties Fri Dec 2 16:33:03 2011
@@ -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
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,9 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<validators>
+ <field name="testBeanArray">
+ <field-validator type="visitor">
+ <message>testBeanArray: </message>
+ </field-validator>
+ </field>
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<validators>
+ <field name="testBeanList">
+ <field-validator type="visitor">
+ <message>testBeanList: </message>
+ </field-validator>
+ </field>
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<validators>
+ <field name="context">
+ <field-validator type="requiredstring">
+ <message>You must enter a context.</message>
+ </field-validator>
+ </field>
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,8 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<validators>
+ <field name="bean">
+ <field-validator type="visitor">
+ <message>bean: </message>
+ </field-validator>
+ </field>
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,9 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,33 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test2.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test2.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test2.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test2.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,17 @@
+<!DOCTYPE validators PUBLIC
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/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>
+
+
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test3.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test3.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test3.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test3.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,11 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test4.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test4.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test4.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test4.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,12 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/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>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test5.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test5.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test5.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test5.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,4 @@
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<validators>
+ <validator name="foo" class="bar" />
+</validators>
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test6.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test6.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test6.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validator-parser-test6.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,27 @@
+<!DOCTYPE validators PUBLIC
+ "-//Apache Struts//XWork Validator 1.0.3//EN"
+ "http://struts.apache.org/dtds/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>
+
Added: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validators-fail.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validators-fail.xml?rev=1209569&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validators-fail.xml (added)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/org/apache/struts2/xwork2/validator/validators-fail.xml Fri Dec 2 16:33:03 2011
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE validators PUBLIC
+ "-//Apache Struts//XWork Validator Config 1.0//EN"
+ "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+<!-- START SNIPPET: validators-default -->
+<validators>
+ <validator name="required" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator nameFail="requiredstring" class="org.apache.struts2.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="org.apache.struts2.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="org.apache.struts2.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="org.apache.struts2.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="org.apache.struts2.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="org.apache.struts2.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="org.apache.struts2.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="org.apache.struts2.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="org.apache.struts2.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="org.apache.struts2.xwork2.validator.validators.StringLengthFieldValidator"/>
+ <validator name="regex" class="org.apache.struts2.xwork2.validator.validators.RegexFieldValidator"/>
+</validators>
+<!-- END SNIPPET: validators-default -->
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/validators.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/validators.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/validators.xml Fri Dec 2 16:33:03 2011
@@ -3,18 +3,18 @@
"-//Apache Struts//XWork Validator Config 1.0//EN"
"http://struts.apache.org/dtds/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"/>
+ <validator name="required" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="org.apache.struts2.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="org.apache.struts2.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="org.apache.struts2.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="org.apache.struts2.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="org.apache.struts2.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="org.apache.struts2.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="org.apache.struts2.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="org.apache.struts2.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="org.apache.struts2.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="org.apache.struts2.xwork2.validator.validators.StringLengthFieldValidator"/>
+ <validator name="regex" class="org.apache.struts2.xwork2.validator.validators.RegexFieldValidator"/>
+ <validator name="conditionalvisitor" class="org.apache.struts2.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
</validators>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork - jar.jar
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork%20-%20jar.jar?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork - zip.zip
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork%20-%20zip.zip?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-jar.jar
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-jar.jar?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-proxyinvoke.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-proxyinvoke.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-proxyinvoke.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-proxyinvoke.xml Fri Dec 2 16:33:03 2011
@@ -3,28 +3,28 @@
"http://struts.apache.org/dtds/xwork-2.0.dtd">
<xwork>
- <bean type="com.opensymphony.xwork2.ObjectFactory" name="default" class="com.opensymphony.xwork2.ProxyObjectFactory" />
+ <bean type="org.apache.struts2.xwork2.ObjectFactory" name="default" class="org.apache.struts2.xwork2.ProxyObjectFactory" />
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
+ <bean type="org.apache.struts2.xwork2.ActionProxyFactory" name="default" class="org.apache.struts2.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-type name="chain" class="org.apache.struts2.xwork2.ActionChainResult" default="true"/>
+ <result-type name="void" class="org.apache.struts2.xwork2.VoidResult"/>
+ <result-type name="mock" class="org.apache.struts2.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">
+ <interceptor name="timer" class="org.apache.struts2.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logger" class="org.apache.struts2.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="chain" class="org.apache.struts2.xwork2.interceptor.ChainingInterceptor"/>
+ <interceptor name="params" class="org.apache.struts2.xwork2.interceptor.ParametersInterceptor"/>
+ <interceptor name="staticParams" class="org.apache.struts2.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="modelDriven" class="org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="validation" class="org.apache.struts2.xwork2.validator.ValidationInterceptor"/>
+ <interceptor name="alias" class="org.apache.struts2.xwork2.interceptor.AliasInterceptor"/>
+ <interceptor name="test" class="org.apache.struts2.xwork2.mock.MockInterceptor">
<param name="foo">expectedFoo</param>
</interceptor>
@@ -43,6 +43,6 @@
<package name="default" extends="xwork-test-default">
- <action name="ProxyInvocation" method="show" class="com.opensymphony.xwork2.ProxyInvocationAction"/>
+ <action name="ProxyInvocation" method="show" class="org.apache.struts2.xwork2.ProxyInvocationAction"/>
</package>
</xwork>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-sample.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-sample.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-sample.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-sample.xml Fri Dec 2 16:33:03 2011
@@ -14,7 +14,7 @@
</result>
</global-results>
- <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="Foo" class="org.apache.struts2.xwork2.SimpleAction">
<param name="foo">17</param>
<param name="bar">23</param>
<result name="success" type="chain">
@@ -24,7 +24,7 @@
<interceptor-ref name="defaultStack"/>
</action>
- <action name="WildCard" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="WildCard" class="org.apache.struts2.xwork2.SimpleAction">
<param name="foo">17</param>
<param name="bar">23</param>
<result name="success" type="void" />
@@ -32,7 +32,7 @@
<interceptor-ref name="defaultStack"/>
</action>
- <action name="WildCardInput" class="com.opensymphony.xwork2.SimpleAction" method="input">
+ <action name="WildCardInput" class="org.apache.struts2.xwork2.SimpleAction" method="input">
<param name="foo">17</param>
<param name="bar">23</param>
<result name="success" type="void" />
@@ -40,13 +40,13 @@
<interceptor-ref name="defaultStack"/>
</action>
- <action name="WildCardError" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="WildCardError" class="org.apache.struts2.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"
+ <action name="WildCard/*/*" class="org.apache.struts2.xwork2.{1}Action"
method="{2}">
<param name="foo">{1}</param>
<param name="bar">{2}</param>
@@ -54,7 +54,7 @@
<interceptor-ref name="defaultStack"/>
</action>
- <action name="aliasTest" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="aliasTest" class="org.apache.struts2.xwork2.SimpleAction">
<param name="aliases">#{ "aliasSource" : "aliasDest", "bar":"baz" }</param>
<interceptor-ref name="params"/>
<interceptor-ref name="alias"/>
@@ -64,26 +64,26 @@
<action name="packagelessAction" class="PackagelessAction">
</action>
- <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="Bar" class="org.apache.struts2.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">
+ <action name="MyBean" class="org.apache.struts2.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">
+ <action name="TestInterceptorParam" class="org.apache.struts2.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">
+ <action name="TestInterceptorParamOverride" class="org.apache.struts2.xwork2.SimpleAction">
<interceptor-ref name="test">
<param name="foo">foo123</param>
<param name="expectedFoo">foo123</param>
@@ -91,14 +91,14 @@
<result name="error" type="mock" />
</action>
- <action name="TestModelDrivenValidation" class="com.opensymphony.xwork2.ModelDrivenAction">
+ <action name="TestModelDrivenValidation" class="org.apache.struts2.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">
+ <action name="InfiniteRecursionChain" class="org.apache.struts2.xwork2.ActionSupport">
<result name="success" type="chain">InfiniteRecursionChain</result>
</action>
@@ -116,19 +116,19 @@
<exception-mapping name="foo" exception="com.opensymphony.TestException" result="foo"/>
</global-exception-mappings>
- <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="Bar" class="org.apache.struts2.xwork2.SimpleAction">
<interceptor-ref name="barDefaultStack"/>
<result name="error" type="mock" />
</action>
- <action name="TestInterceptorParamInheritance" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="TestInterceptorParamInheritance" class="org.apache.struts2.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">
+ <action name="TestInterceptorParamInehritanceOverride" class="org.apache.struts2.xwork2.SimpleAction">
<interceptor-ref name="test">
<param name="foo">foo123</param>
<param name="expectedFoo">foo123</param>
@@ -138,13 +138,13 @@
</package>
<package name="abstractPackage" namespace="/abstract" abstract="true">
- <action name="test" class="com.opensymphony.xwork2.SimpleAction"/>
+ <action name="test" class="org.apache.struts2.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">
+ <action name="commandTest" class="org.apache.struts2.xwork2.SimpleAction">
<param name="foo">123</param>
<result name="error" type="chain">
<param name="actionName">bar</param>
@@ -152,21 +152,21 @@
<result name="success" type="mock" />
<interceptor-ref name="staticParams"/>
</action>
- <action name="myCommand" class="com.opensymphony.xwork2.SimpleAction" method="commandMethod">
+ <action name="myCommand" class="org.apache.struts2.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"/>
+ <result name="org.apache.struts2.xwork2.SimpleAction.CommandInvoked" type="mock"/>
<interceptor-ref name="logger"/>
</action>
- <action name="doMethodTest" class="com.opensymphony.xwork2.SimpleAction" method="input">
+ <action name="doMethodTest" class="org.apache.struts2.xwork2.SimpleAction" method="input">
<result name="input" type="mock" />
</action>
- <action name="unknownMethodTest" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="unknownMethodTest" class="org.apache.struts2.xwork2.SimpleAction">
<result name="found" type="mock" />
</action>
- <action name="resultAction" class="com.opensymphony.xwork2.SimpleAction" method="resultAction">
+ <action name="resultAction" class="org.apache.struts2.xwork2.SimpleAction" method="resultAction">
<param name="bar">456</param>
<result name="success" type="chain">
<param name="actionName">foo</param>
@@ -176,14 +176,14 @@
</package>
<package name="wildcardNamespaces" extends="default" namespace="/animals/*">
- <action name="commandTest" class="com.opensymphony.xwork2.SimpleAction">
+ <action name="commandTest" class="org.apache.struts2.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">
+ <action name="testMultipleInheritance" class="org.apache.struts2.xwork2.SimpleAction">
<result name="success" type="chain">
<param name="actionName">foo</param>
</result>
@@ -194,7 +194,7 @@
<package name="Abstract-crud" extends="default">
<!-- edit is often used as the create/view -->
- <default-class-ref class="com.opensymphony.xwork2.SimpleAction"/>
+ <default-class-ref class="org.apache.struts2.xwork2.SimpleAction"/>
<action name="edit" >
<result name="input" type="mock">edit.vm</result>
<result name="success" type="mock">edit.vm</result>
@@ -216,18 +216,18 @@
</package>
<package name="Example" extends="Abstract-crud" namespace="/example">
- <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
+ <default-class-ref class="org.apache.struts2.xwork2.ModelDrivenAction" />
</package>
<package name="Example2" extends="Abstract-crud" namespace="/example2">
- <default-class-ref class="com.opensymphony.xwork2.ModelDrivenAction" />
+ <default-class-ref class="org.apache.struts2.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" />
+ <default-class-ref class="org.apache.struts2.xwork2.ModelDrivenAction" />
</package>
<package name="Example3" extends="Abstract-crud" namespace="/example3">
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-beans.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-beans.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-beans.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-beans.xml Fri Dec 2 16:33:03 2011
@@ -4,24 +4,24 @@
<xwork>
<!--
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
+ <bean class="org.apache.struts2.xwork2.ObjectFactory" name="default" />
+ <bean type="org.apache.struts2.xwork2.ActionProxyFactory" name="default" class="org.apache.struts2.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" />
+ <bean type="org.apache.struts2.xwork2.util.ValueStackFactory"
+ class="org.apache.struts2.xwork2.ognl.OgnlValueStackFactory" />
+ <bean type="org.apache.struts2.xwork2.util.reflection.ReflectionProvider"
+ class="org.apache.struts2.xwork2.ognl.OgnlReflectionProvider" />
+ <bean type="org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory"
+ class="org.apache.struts2.xwork2.ognl.OgnlReflectionContextFactory" />
+ <bean class="org.apache.struts2.xwork2.conversion.impl.XWorkConverter" />
+ <bean type="org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer"
+ class="org.apache.struts2.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" />
+ <bean class="org.apache.struts2.xwork2.ognl.OgnlValueStack" static="true"/>
+ <bean class="org.apache.struts2.xwork2.conversion.impl.XWorkConverter" static="true"/>
+ <bean class="org.apache.struts2.xwork2.util.reflection.ReflectionProviderFactory" static="true" />
-->
</xwork>
\ No newline at end of file
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-default.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-default.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-default.xml Fri Dec 2 16:33:03 2011
@@ -6,21 +6,21 @@
<xwork>
<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-type name="chain" class="org.apache.struts2.xwork2.ActionChainResult" default="true"/>
+ <result-type name="void" class="org.apache.struts2.xwork2.VoidResult"/>
+ <result-type name="mock" class="org.apache.struts2.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">
+ <interceptor name="timer" class="org.apache.struts2.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logger" class="org.apache.struts2.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="chain" class="org.apache.struts2.xwork2.interceptor.ChainingInterceptor"/>
+ <interceptor name="params" class="org.apache.struts2.xwork2.interceptor.ParametersInterceptor"/>
+ <interceptor name="staticParams" class="org.apache.struts2.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="modelDriven" class="org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="validation" class="org.apache.struts2.xwork2.validator.ValidationInterceptor"/>
+ <interceptor name="alias" class="org.apache.struts2.xwork2.interceptor.AliasInterceptor"/>
+ <interceptor name="test" class="org.apache.struts2.xwork2.mock.MockInterceptor">
<param name="foo">expectedFoo</param>
</interceptor>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-validation.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-validation.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-validation.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-validation.xml Fri Dec 2 16:33:03 2011
@@ -7,23 +7,23 @@
<include file="xwork-test-beans.xml" />
<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-type name="chain" class="org.apache.struts2.xwork2.ActionChainResult" default="true"/>
+ <result-type name="void" class="org.apache.struts2.xwork2.VoidResult"/>
+ <result-type name="mock" class="org.apache.struts2.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="timer" class="org.apache.struts2.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logger" class="org.apache.struts2.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="chain" class="org.apache.struts2.xwork2.interceptor.ChainingInterceptor"/>
+ <interceptor name="params" class="org.apache.struts2.xwork2.interceptor.ParametersInterceptor"/>
+ <interceptor name="staticParams" class="org.apache.struts2.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="modelDriven" class="org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="validation" class="org.apache.struts2.xwork2.validator.ValidationInterceptor">
<param name="validateAnnotatedMethodOnly">true</param>
</interceptor>
- <interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/>
- <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
+ <interceptor name="alias" class="org.apache.struts2.xwork2.interceptor.AliasInterceptor"/>
+ <interceptor name="test" class="org.apache.struts2.xwork2.mock.MockInterceptor">
<param name="foo">expectedFoo</param>
</interceptor>
@@ -49,12 +49,12 @@
</package>
<package name="default" extends="xwork-test-default">
- <action name="annotatedMethod" class="com.opensymphony.xwork2.test.annotations.ValidateAnnotatedMethodOnlyAction" method="annotatedMethod">
+ <action name="annotatedMethod" class="org.apache.struts2.xwork2.test.annotations.ValidateAnnotatedMethodOnlyAction" method="annotatedMethod">
<interceptor-ref name="validationStack"/>
<result name="success" type="mock"/>
</action>
- <action name="notAnnotatedMethod" class="com.opensymphony.xwork2.test.annotations.ValidateAnnotatedMethodOnlyAction" method="notAnnotatedMethod">
+ <action name="notAnnotatedMethod" class="org.apache.struts2.xwork2.test.annotations.ValidateAnnotatedMethodOnlyAction" method="notAnnotatedMethod">
<interceptor-ref name="validationStack"/>
<result name="success" type="mock"/>
</action>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-zip.zip
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-zip.zip?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
Binary files - no diff available.