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/01 08:27:13 UTC

svn commit: r1208981 [24/24] - 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...

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RegexFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RegexFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RegexFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RegexFieldValidatorTest.java Thu Dec  1 07:18:07 2011
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.RegexFieldValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.RegexFieldValidator;
 
 import java.util.List;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java Thu Dec  1 07:18:07 2011
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.RepopulateConversionErrorFieldValidatorSupport;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.RepopulateConversionErrorFieldValidatorSupport;
 
 import java.util.Map;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ShortRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ShortRangeValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ShortRangeValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ShortRangeValidatorTest.java Thu Dec  1 07:18:07 2011
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
 
 import java.util.HashMap;
 import java.util.List;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/SimpleActionValidationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/SimpleActionValidationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/SimpleActionValidationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/SimpleActionValidationTest.java Thu Dec  1 07:18:07 2011
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.ValidatorSupport;
 
 import java.util.*;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringLengthFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringLengthFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringLengthFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringLengthFieldValidatorTest.java Thu Dec  1 07:18:07 2011
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.validator.validators.StringLengthFieldValidator;
 
 /**
  * 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/StringValidatorTest.java Thu Dec  1 07:18:07 2011
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.test.Equidae;
-import com.opensymphony.xwork2.validator.validators.RequiredStringValidator;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.test.Equidae;
+import org.apache.struts2.xwork2.validator.validators.RequiredStringValidator;
 
 import java.util.List;
 import java.util.Map;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/URLValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/URLValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/URLValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/URLValidatorTest.java Thu Dec  1 07:18:07 2011
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.URLValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.URLValidator;
 
 /**
  * Test case for URLValidator

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ValidatorAnnotationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ValidatorAnnotationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ValidatorAnnotationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ValidatorAnnotationTest.java Thu Dec  1 07:18:07 2011
@@ -1,10 +1,10 @@
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorModelTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorModelTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorModelTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorModelTest.java Thu Dec  1 07:18:07 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.test.TestBean2;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.test.TestBean2;
 
 import java.util.*;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorFieldValidatorTest.java Thu Dec  1 07:18:07 2011
@@ -13,16 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
 
 import java.util.*;
 
 import org.easymock.EasyMock;
-import org.easymock.IAnswer;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorModelAction.java Thu Dec  1 07:18:07 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.ModelDriven;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/VisitorValidatorTestAction.java Thu Dec  1 07:18:07 2011
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
 
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.TestBean;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.TestBean;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupportTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupportTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupportTest.java Thu Dec  1 07:18:07 2011
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.ognl.OgnlValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.ognl.OgnlValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.validator.ValidationException;
 
 /**
  * @author tmjee

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/includeTest.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/includeTest.xml?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/includeTest.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/includeTest.xml Thu Dec  1 07:18:07 2011
@@ -5,6 +5,6 @@
 
 <xwork>
     <package name="includeTest" extends="default" namespace="includeTest">
-        <action name="includeTest" class="com.opensymphony.xwork2.SimpleAction"></action>
+        <action name="includeTest" class="org.apache.struts2.xwork2.SimpleAction"></action>
     </package>
 </xwork>

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/my-validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/my-validators.xml?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/my-validators.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/my-validators.xml Thu Dec  1 07:18:07 2011
@@ -3,5 +3,5 @@
         "-//Apache Struts//XWork Validator Config 1.0//EN"
         "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <validators>
-    <validator name="requiredAdditional" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+    <validator name="requiredAdditional" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
 </validators>

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/myOther-validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/myOther-validators.xml?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/myOther-validators.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/myOther-validators.xml Thu Dec  1 07:18:07 2011
@@ -3,5 +3,5 @@
         "-//Apache Struts//XWork Validator Config 1.0//EN"
         "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <validators>
-    <validator name="requiredAnother" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+    <validator name="requiredAnother" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
 </validators>

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=1208981&r1=1208980&r2=1208981&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 Thu Dec  1 07:18:07 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-proxyinvoke.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-proxyinvoke.xml?rev=1208981&r1=1208980&r2=1208981&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 Thu Dec  1 07:18:07 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=1208981&r1=1208980&r2=1208981&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 Thu Dec  1 07:18:07 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-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/resources/xwork-test-default.xml?rev=1208981&r1=1208980&r2=1208981&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 Thu Dec  1 07:18:07 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=1208981&r1=1208980&r2=1208981&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 Thu Dec  1 07:18:07 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>