diff --git a/core/pom.xml b/core/pom.xml
index be09a0bff..05ecb16f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -73,6 +73,39 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <argLine>-Duser.language=en -Duser.region=US</argLine>
+                    <properties>
+                        <property>
+                            <name>maven.testng.output.dir</name>
+                            <value>${project.basedir}/target/surefire-reports</value>
+                        </property>
+                    </properties>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                    <additionalClasspathElements>
+                        <element>${project.build.testOutputDirectory}/xwork-jar.jar</element>
+                        <element>${project.build.testOutputDirectory}/xwork-zip.zip</element>
+                        <element>${project.build.testOutputDirectory}/xwork - jar.jar</element>
+                        <element>${project.build.testOutputDirectory}/xwork - zip.zip</element>
+                    </additionalClasspathElements>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/XWorkTestCase.java</exclude>
+                        <exclude>**/TestBean.java</exclude>
+                        <exclude>**/TestBean2.java</exclude>
+                        <exclude>**/TestInterceptor.java</exclude>
+                        <exclude>**/AnnotatedTestBean.java</exclude>
+                        <exclude>**/ContainerImplTest.java</exclude>
+                        <exclude>**/URLUtilTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -151,11 +184,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts.xwork</groupId>
-            <artifactId>xwork-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
@@ -208,30 +236,80 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <!-- Mocks for unit testing (by Spring) -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-core</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -277,6 +355,17 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- These jars have to be in the compile scope in order to work with apt plugin
              (struts-annotations) and javadoc (the rest to process xwork sources). Marking 
              them optional to exclude them from transitive dependency resolution -->
@@ -296,10 +385,15 @@
             <classifier>jdk15</classifier>
         </dependency>
 
+        <!-- SLF4J support -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <scope>compile</scope>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/Action.java b/core/src/main/java/com/opensymphony/xwork2/Action.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/Action.java
rename to core/src/main/java/com/opensymphony/xwork2/Action.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java b/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionContext.java b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionContext.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionContext.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java b/core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionProxy.java b/core/src/main/java/com/opensymphony/xwork2/ActionProxy.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionProxy.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionProxy.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java b/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
rename to core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
rename to core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
rename to core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java b/core/src/main/java/com/opensymphony/xwork2/FileManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java
rename to core/src/main/java/com/opensymphony/xwork2/FileManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java b/core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/InvalidMetadataException.java b/core/src/main/java/com/opensymphony/xwork2/InvalidMetadataException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/InvalidMetadataException.java
rename to core/src/main/java/com/opensymphony/xwork2/InvalidMetadataException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java b/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/MockActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/MockActionInvocation.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/MockActionInvocation.java
rename to core/src/main/java/com/opensymphony/xwork2/MockActionInvocation.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ModelDriven.java b/core/src/main/java/com/opensymphony/xwork2/ModelDriven.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ModelDriven.java
rename to core/src/main/java/com/opensymphony/xwork2/ModelDriven.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java b/core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/Preparable.java b/core/src/main/java/com/opensymphony/xwork2/Preparable.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/Preparable.java
rename to core/src/main/java/com/opensymphony/xwork2/Preparable.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/Result.java b/core/src/main/java/com/opensymphony/xwork2/Result.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/Result.java
rename to core/src/main/java/com/opensymphony/xwork2/Result.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/TestNGXWorkTestCase.java b/core/src/main/java/com/opensymphony/xwork2/TestNGXWorkTestCase.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/TestNGXWorkTestCase.java
rename to core/src/main/java/com/opensymphony/xwork2/TestNGXWorkTestCase.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java b/core/src/main/java/com/opensymphony/xwork2/TextProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/TextProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java b/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/Unchainable.java b/core/src/main/java/com/opensymphony/xwork2/Unchainable.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/Unchainable.java
rename to core/src/main/java/com/opensymphony/xwork2/Unchainable.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
rename to core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
rename to core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/Validateable.java b/core/src/main/java/com/opensymphony/xwork2/Validateable.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/Validateable.java
rename to core/src/main/java/com/opensymphony/xwork2/Validateable.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ValidationAware.java b/core/src/main/java/com/opensymphony/xwork2/ValidationAware.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ValidationAware.java
rename to core/src/main/java/com/opensymphony/xwork2/ValidationAware.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java b/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWork.java b/core/src/main/java/com/opensymphony/xwork2/XWork.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/XWork.java
rename to core/src/main/java/com/opensymphony/xwork2/XWork.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
rename to core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkException.java b/core/src/main/java/com/opensymphony/xwork2/XWorkException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/XWorkException.java
rename to core/src/main/java/com/opensymphony/xwork2/XWorkException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java b/core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java
similarity index 97%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java
rename to core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java
index 86a33c635..90b53d213 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java
+++ b/core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java
@@ -1,79 +1,79 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2;
-
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.inject.*;
-import com.opensymphony.xwork2.test.StubConfigurationProvider;
-import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import org.junit.After;
-import org.junit.Before;
-
-public abstract class XWorkJUnit4TestCase {
-
-    protected ConfigurationManager configurationManager;
-    protected Configuration configuration;
-    protected Container container;
-    protected ActionProxyFactory actionProxyFactory;
-
-    @Before
-    public void setUp() throws Exception {
-        configurationManager = XWorkTestCaseHelper.setUp();
-        configuration = configurationManager.getConfiguration();
-        container = configuration.getContainer();
-        actionProxyFactory = container.getInstance(ActionProxyFactory.class);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        XWorkTestCaseHelper.tearDown(configurationManager);
-        configurationManager = null;
-        configuration = null;
-        container = null;
-        actionProxyFactory = null;
-    }
-
-    protected void loadConfigurationProviders(ConfigurationProvider... providers) {
-        configurationManager = XWorkTestCaseHelper.loadConfigurationProviders(configurationManager, providers);
-        configuration = configurationManager.getConfiguration();
-        container = configuration.getContainer();
-        actionProxyFactory = container.getInstance(ActionProxyFactory.class);
-    }
-
-    protected void loadButAdd(final Class<?> type, final Object impl) {
-        loadButAdd(type, Container.DEFAULT_NAME, impl);
-    }
-
-    protected void loadButAdd(final Class<?> type, final String name, final Object impl) {
-        loadConfigurationProviders(new StubConfigurationProvider() {
-            @Override
-            public void register(ContainerBuilder builder,
-                                 LocatableProperties props) throws ConfigurationException {
-                builder.factory(type, name, new Factory() {
-                    public Object create(Context context) throws Exception {
-                        return impl;
-                    }
-
-                }, Scope.SINGLETON);
-            }
-        });
-    }
-
-}
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.opensymphony.xwork2;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.inject.*;
+import com.opensymphony.xwork2.test.StubConfigurationProvider;
+import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.junit.After;
+import org.junit.Before;
+
+public abstract class XWorkJUnit4TestCase {
+
+    protected ConfigurationManager configurationManager;
+    protected Configuration configuration;
+    protected Container container;
+    protected ActionProxyFactory actionProxyFactory;
+
+    @Before
+    public void setUp() throws Exception {
+        configurationManager = XWorkTestCaseHelper.setUp();
+        configuration = configurationManager.getConfiguration();
+        container = configuration.getContainer();
+        actionProxyFactory = container.getInstance(ActionProxyFactory.class);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        XWorkTestCaseHelper.tearDown(configurationManager);
+        configurationManager = null;
+        configuration = null;
+        container = null;
+        actionProxyFactory = null;
+    }
+
+    protected void loadConfigurationProviders(ConfigurationProvider... providers) {
+        configurationManager = XWorkTestCaseHelper.loadConfigurationProviders(configurationManager, providers);
+        configuration = configurationManager.getConfiguration();
+        container = configuration.getContainer();
+        actionProxyFactory = container.getInstance(ActionProxyFactory.class);
+    }
+
+    protected void loadButAdd(final Class<?> type, final Object impl) {
+        loadButAdd(type, Container.DEFAULT_NAME, impl);
+    }
+
+    protected void loadButAdd(final Class<?> type, final String name, final Object impl) {
+        loadConfigurationProviders(new StubConfigurationProvider() {
+            @Override
+            public void register(ContainerBuilder builder,
+                                 LocatableProperties props) throws ConfigurationException {
+                builder.factory(type, name, new Factory() {
+                    public Object create(Context context) throws Exception {
+                        return impl;
+                    }
+
+                }, Scope.SINGLETON);
+            }
+        });
+    }
+
+}
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java b/core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java
rename to core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
rename to core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/Configuration.java b/core/src/main/java/com/opensymphony/xwork2/config/Configuration.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/Configuration.java
rename to core/src/main/java/com/opensymphony/xwork2/config/Configuration.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java b/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java
rename to core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java b/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
rename to core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java b/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/ReferenceResolverException.java b/core/src/main/java/com/opensymphony/xwork2/config/ReferenceResolverException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/ReferenceResolverException.java
rename to core/src/main/java/com/opensymphony/xwork2/config/ReferenceResolverException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java
rename to core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/package.html b/core/src/main/java/com/opensymphony/xwork2/config/entities/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/package.html
rename to core/src/main/java/com/opensymphony/xwork2/config/entities/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/package.html b/core/src/main/java/com/opensymphony/xwork2/config/impl/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/package.html
rename to core/src/main/java/com/opensymphony/xwork2/config/impl/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/package.html b/core/src/main/java/com/opensymphony/xwork2/config/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/package.html
rename to core/src/main/java/com/opensymphony/xwork2/config/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/package.html b/core/src/main/java/com/opensymphony/xwork2/config/providers/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/package.html
rename to core/src/main/java/com/opensymphony/xwork2/config/providers/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java b/core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java b/core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java b/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java b/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java b/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/package.html b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/package.html
rename to core/src/main/java/com/opensymphony/xwork2/conversion/annotations/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java b/core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/package.html b/core/src/main/java/com/opensymphony/xwork2/conversion/metadata/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/package.html
rename to core/src/main/java/com/opensymphony/xwork2/conversion/metadata/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultUnknownHandlerFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultUnknownHandlerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultUnknownHandlerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/DefaultUnknownHandlerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultValidatorFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultValidatorFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/DefaultValidatorFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/DefaultValidatorFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/InterceptorFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/InterceptorFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/InterceptorFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/InterceptorFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java b/core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java b/core/src/main/java/com/opensymphony/xwork2/inject/Container.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Container.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java b/core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java b/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Context.java b/core/src/main/java/com/opensymphony/xwork2/inject/Context.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Context.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Context.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java b/core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java b/core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Factory.java b/core/src/main/java/com/opensymphony/xwork2/inject/Factory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Factory.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Factory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Inject.java b/core/src/main/java/com/opensymphony/xwork2/inject/Inject.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Inject.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Inject.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java b/core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java b/core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Key.java b/core/src/main/java/com/opensymphony/xwork2/inject/Key.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Key.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Key.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scope.java b/core/src/main/java/com/opensymphony/xwork2/inject/Scope.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scope.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Scope.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java b/core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/package-info.java b/core/src/main/java/com/opensymphony/xwork2/inject/package-info.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/package-info.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/package-info.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java b/core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/package.html b/core/src/main/java/com/opensymphony/xwork2/inject/util/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/package.html
rename to core/src/main/java/com/opensymphony/xwork2/inject/util/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/package.html b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/package.html
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/package.html b/core/src/main/java/com/opensymphony/xwork2/interceptor/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/package.html
rename to core/src/main/java/com/opensymphony/xwork2/interceptor/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java
rename to core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java
rename to core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java
rename to core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java
rename to core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java b/core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
rename to core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/package.html b/core/src/main/java/com/opensymphony/xwork2/mock/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/mock/package.html
rename to core/src/main/java/com/opensymphony/xwork2/mock/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java b/core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java
similarity index 96%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java
index 0172e73da..e136241a1 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java
@@ -1,58 +1,58 @@
-package com.opensymphony.xwork2.ognl;
-
-/**
- * Helper class to build error messages.
- */
-public class ErrorMessageBuilder {
-
-    private StringBuilder message = new StringBuilder();
-
-    public static ErrorMessageBuilder create() {
-        return new ErrorMessageBuilder();
-    }
-
-    private ErrorMessageBuilder() {
-    }
-
-    public ErrorMessageBuilder errorSettingExpressionWithValue(String expr, Object value) {
-        appenExpression(expr);
-        if (value instanceof Object[]) {
-            appendValueAsArray((Object[]) value, message);
-        } else {
-            appendValue(value);
-        }
-        return this;
-    }
-
-    private void appenExpression(String expr) {
-        message.append("Error setting expression '");
-        message.append(expr);
-        message.append("' with value ");
-    }
-
-    private void appendValue(Object value) {
-        message.append("'");
-        message.append(value);
-        message.append("'");
-    }
-
-    private void appendValueAsArray(Object[] valueArray, StringBuilder msg) {
-        msg.append("[");
-        for (int index = 0; index < valueArray.length; index++) {
-            appendValue(valueArray[index]);
-            if (hasMoreElements(valueArray, index)) {
-                msg.append(", ");
-            }
-        }
-        msg.append("]");
-    }
-
-    private boolean hasMoreElements(Object[] valueArray, int index) {
-        return index < (valueArray.length + 1);
-    }
-
-    public String build() {
-        return message.toString();
-    }
-
-}
+package com.opensymphony.xwork2.ognl;
+
+/**
+ * Helper class to build error messages.
+ */
+public class ErrorMessageBuilder {
+
+    private StringBuilder message = new StringBuilder();
+
+    public static ErrorMessageBuilder create() {
+        return new ErrorMessageBuilder();
+    }
+
+    private ErrorMessageBuilder() {
+    }
+
+    public ErrorMessageBuilder errorSettingExpressionWithValue(String expr, Object value) {
+        appenExpression(expr);
+        if (value instanceof Object[]) {
+            appendValueAsArray((Object[]) value, message);
+        } else {
+            appendValue(value);
+        }
+        return this;
+    }
+
+    private void appenExpression(String expr) {
+        message.append("Error setting expression '");
+        message.append(expr);
+        message.append("' with value ");
+    }
+
+    private void appendValue(Object value) {
+        message.append("'");
+        message.append(value);
+        message.append("'");
+    }
+
+    private void appendValueAsArray(Object[] valueArray, StringBuilder msg) {
+        msg.append("[");
+        for (int index = 0; index < valueArray.length; index++) {
+            appendValue(valueArray[index]);
+            if (hasMoreElements(valueArray, index)) {
+                msg.append(", ");
+            }
+        }
+        msg.append("]");
+    }
+
+    private boolean hasMoreElements(Object[] valueArray, int index) {
+        return index < (valueArray.length + 1);
+    }
+
+    public String build() {
+        return message.toString();
+    }
+
+}
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java b/core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java b/core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessorTest.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessorTest.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessorTest.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessorTest.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java b/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java
rename to core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/package.html b/core/src/main/java/com/opensymphony/xwork2/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/package.html
rename to core/src/main/java/com/opensymphony/xwork2/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java b/core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java
rename to core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
rename to core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
rename to core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
rename to core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
rename to core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java b/core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java b/core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/package.html b/core/src/main/java/com/opensymphony/xwork2/spring/interceptor/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/spring/interceptor/package.html
rename to core/src/main/java/com/opensymphony/xwork2/spring/interceptor/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/package.html b/core/src/main/java/com/opensymphony/xwork2/spring/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/spring/package.html
rename to core/src/main/java/com/opensymphony/xwork2/spring/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
rename to core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ArrayUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/ArrayUtils.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ArrayUtils.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ArrayUtils.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java b/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java b/core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java b/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java
rename to core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java b/core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java
rename to core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java b/core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
rename to core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/Element.java b/core/src/main/java/com/opensymphony/xwork2/util/Element.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/Element.java
rename to core/src/main/java/com/opensymphony/xwork2/util/Element.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/Key.java b/core/src/main/java/com/opensymphony/xwork2/util/Key.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/Key.java
rename to core/src/main/java/com/opensymphony/xwork2/util/Key.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java b/core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java
rename to core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java b/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
rename to core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java b/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
rename to core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java b/core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
rename to core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java b/core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java
rename to core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java b/core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java
rename to core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParser.java b/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParser.java
rename to core/src/main/java/com/opensymphony/xwork2/util/TextParser.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java b/core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java b/core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java
rename to core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java
rename to core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java b/core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
rename to core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java b/core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
rename to core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java b/core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java
rename to core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java b/core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java
rename to core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java b/core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java
rename to core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java b/core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java
rename to core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java b/core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java
rename to core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java b/core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java
rename to core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
rename to core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java b/core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
rename to core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java b/core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java
rename to core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java b/core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java
rename to core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java b/core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java
rename to core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java b/core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java b/core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/Located.java b/core/src/main/java/com/opensymphony/xwork2/util/location/Located.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/Located.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/Located.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/Location.java b/core/src/main/java/com/opensymphony/xwork2/util/location/Location.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/Location.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/Location.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java b/core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java b/core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java
rename to core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/location/package.html b/core/src/main/java/com/opensymphony/xwork2/util/location/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/location/package.html
rename to core/src/main/java/com/opensymphony/xwork2/util/location/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLoggerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2LoggerFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
similarity index 96%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
index 10acaf871..a30303215 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
@@ -1,123 +1,123 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.logging.slf4j;
-
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerUtils;
-
-/**
- * Simple logger that delegates to slf4j logging
- */
-@Deprecated
-public class Slf4jLogger implements Logger {
-    
-    private org.slf4j.Logger log;
-    
-    public Slf4jLogger(org.slf4j.Logger log) {
-        this.log = log;
-    }
-
-    public void error(String msg, String... args) {
-        log.error(LoggerUtils.format(msg, args));
-    }
-
-    public void error(String msg, Object... args) {
-        log.error(LoggerUtils.format(msg, args));
-    }
-
-    public void error(String msg, Throwable ex, String... args) {
-        log.error(LoggerUtils.format(msg, args), ex);
-    }
-
-    public void info(String msg, String... args) {
-        log.info(LoggerUtils.format(msg, args));
-    }
-
-    public void info(String msg, Throwable ex, String... args) {
-        log.info(LoggerUtils.format(msg, args), ex);
-    }
-
-    public boolean isInfoEnabled() {
-        return log.isInfoEnabled();
-    }
-
-    public void warn(String msg, String... args) {
-        log.warn(LoggerUtils.format(msg, args));
-    }
-
-    public void warn(String msg, Object... args) {
-        log.warn(LoggerUtils.format(msg, args));
-    }
-
-    public void warn(String msg, Throwable ex, String... args) {
-        log.warn(LoggerUtils.format(msg, args), ex);
-    }
-    
-    public boolean isDebugEnabled() {
-        return log.isDebugEnabled();
-    }
-    
-    public void debug(String msg, String... args) {
-        log.debug(LoggerUtils.format(msg, args));
-    }
-
-    public void debug(String msg, Object... args) {
-        log.debug(LoggerUtils.format(msg, args));
-    }
-
-    public void debug(String msg, Throwable ex, String... args) {
-        log.debug(LoggerUtils.format(msg, args), ex);
-    }
-    
-    public boolean isTraceEnabled() {
-        return log.isTraceEnabled();
-    }
-    
-    public void trace(String msg, String... args) {
-        log.trace(LoggerUtils.format(msg, args));
-    }
-
-    public void trace(String msg, Object... args) {
-        log.trace(LoggerUtils.format(msg, args));
-    }
-
-    public void trace(String msg, Throwable ex, String... args) {
-        log.trace(LoggerUtils.format(msg, args), ex);
-    }
-
-
-    public void fatal(String msg, String... args) {
-        log.error(LoggerUtils.format(msg, args));
-    }
-
-    public void fatal(String msg, Throwable ex, String... args) {
-        log.error(LoggerUtils.format(msg, args), ex);
-    }
-
-    public boolean isErrorEnabled() {
-        return log.isErrorEnabled();
-    }
-
-    /** Fatal is not support by Slf4j */
-    public boolean isFatalEnabled() {
-        return log.isErrorEnabled();
-    }
-
-    public boolean isWarnEnabled() {
-        return log.isWarnEnabled();
-    }
-
-}
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.opensymphony.xwork2.util.logging.slf4j;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerUtils;
+
+/**
+ * Simple logger that delegates to slf4j logging
+ */
+@Deprecated
+public class Slf4jLogger implements Logger {
+    
+    private org.slf4j.Logger log;
+    
+    public Slf4jLogger(org.slf4j.Logger log) {
+        this.log = log;
+    }
+
+    public void error(String msg, String... args) {
+        log.error(LoggerUtils.format(msg, args));
+    }
+
+    public void error(String msg, Object... args) {
+        log.error(LoggerUtils.format(msg, args));
+    }
+
+    public void error(String msg, Throwable ex, String... args) {
+        log.error(LoggerUtils.format(msg, args), ex);
+    }
+
+    public void info(String msg, String... args) {
+        log.info(LoggerUtils.format(msg, args));
+    }
+
+    public void info(String msg, Throwable ex, String... args) {
+        log.info(LoggerUtils.format(msg, args), ex);
+    }
+
+    public boolean isInfoEnabled() {
+        return log.isInfoEnabled();
+    }
+
+    public void warn(String msg, String... args) {
+        log.warn(LoggerUtils.format(msg, args));
+    }
+
+    public void warn(String msg, Object... args) {
+        log.warn(LoggerUtils.format(msg, args));
+    }
+
+    public void warn(String msg, Throwable ex, String... args) {
+        log.warn(LoggerUtils.format(msg, args), ex);
+    }
+    
+    public boolean isDebugEnabled() {
+        return log.isDebugEnabled();
+    }
+    
+    public void debug(String msg, String... args) {
+        log.debug(LoggerUtils.format(msg, args));
+    }
+
+    public void debug(String msg, Object... args) {
+        log.debug(LoggerUtils.format(msg, args));
+    }
+
+    public void debug(String msg, Throwable ex, String... args) {
+        log.debug(LoggerUtils.format(msg, args), ex);
+    }
+    
+    public boolean isTraceEnabled() {
+        return log.isTraceEnabled();
+    }
+    
+    public void trace(String msg, String... args) {
+        log.trace(LoggerUtils.format(msg, args));
+    }
+
+    public void trace(String msg, Object... args) {
+        log.trace(LoggerUtils.format(msg, args));
+    }
+
+    public void trace(String msg, Throwable ex, String... args) {
+        log.trace(LoggerUtils.format(msg, args), ex);
+    }
+
+
+    public void fatal(String msg, String... args) {
+        log.error(LoggerUtils.format(msg, args));
+    }
+
+    public void fatal(String msg, Throwable ex, String... args) {
+        log.error(LoggerUtils.format(msg, args), ex);
+    }
+
+    public boolean isErrorEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    /** Fatal is not support by Slf4j */
+    public boolean isFatalEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    public boolean isWarnEnabled() {
+        return log.isWarnEnabled();
+    }
+
+}
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
similarity index 97%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
index 77a80304d..6e3e6d5fb 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
@@ -1,42 +1,42 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.logging.slf4j;
-
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-/**
- * Creates slf4j-logging-backed loggers
- *
- * You can use the same to explicit tell the framework which implementation to use and don't depend on class discovery:
- * <pre>
- *   -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory
- * </pre>
- */
-@Deprecated
-public class Slf4jLoggerFactory extends LoggerFactory {
-
-    @Override
-    protected Logger getLoggerImpl(Class<?> cls) {
-        return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(cls));
-    }
-
-    @Override
-    protected Logger getLoggerImpl(String name) {
-        return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(name));
-    }
-
-}
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.opensymphony.xwork2.util.logging.slf4j;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+/**
+ * Creates slf4j-logging-backed loggers
+ *
+ * You can use the same to explicit tell the framework which implementation to use and don't depend on class discovery:
+ * <pre>
+ *   -Dxwork.loggerFactory=com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory
+ * </pre>
+ */
+@Deprecated
+public class Slf4jLoggerFactory extends LoggerFactory {
+
+    @Override
+    protected Logger getLoggerImpl(Class<?> cls) {
+        return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(cls));
+    }
+
+    @Override
+    protected Logger getLoggerImpl(String name) {
+        return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(name));
+    }
+
+}
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/package.html b/core/src/main/java/com/opensymphony/xwork2/util/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/package.html
rename to core/src/main/java/com/opensymphony/xwork2/util/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java
rename to core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java
rename to core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java
rename to core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/package.html b/core/src/main/java/com/opensymphony/xwork2/util/profiling/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/profiling/package.html
rename to core/src/main/java/com/opensymphony/xwork2/util/profiling/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java b/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java
rename to core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java b/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java
rename to core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java b/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java
rename to core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java b/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java
rename to core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/Validator.java b/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java b/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validation.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validation.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validation.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validation.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/package.html b/core/src/main/java/com/opensymphony/xwork2/validator/annotations/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/annotations/package.html
rename to core/src/main/java/com/opensymphony/xwork2/validator/annotations/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/package.html b/core/src/main/java/com/opensymphony/xwork2/validator/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/package.html
rename to core/src/main/java/com/opensymphony/xwork2/validator/package.html
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/package.html b/core/src/main/java/com/opensymphony/xwork2/validator/validators/package.html
similarity index 100%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/package.html
rename to core/src/main/java/com/opensymphony/xwork2/validator/validators/package.html
diff --git a/xwork-core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml b/core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
similarity index 100%
rename from xwork-core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
rename to core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
diff --git a/xwork-core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties b/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
similarity index 100%
rename from xwork-core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
rename to core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
diff --git a/xwork-core/src/main/resources/xwork-1.0.dtd b/core/src/main/resources/xwork-1.0.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-1.0.dtd
rename to core/src/main/resources/xwork-1.0.dtd
diff --git a/xwork-core/src/main/resources/xwork-1.1.1.dtd b/core/src/main/resources/xwork-1.1.1.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-1.1.1.dtd
rename to core/src/main/resources/xwork-1.1.1.dtd
diff --git a/xwork-core/src/main/resources/xwork-1.1.2.dtd b/core/src/main/resources/xwork-1.1.2.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-1.1.2.dtd
rename to core/src/main/resources/xwork-1.1.2.dtd
diff --git a/xwork-core/src/main/resources/xwork-1.1.dtd b/core/src/main/resources/xwork-1.1.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-1.1.dtd
rename to core/src/main/resources/xwork-1.1.dtd
diff --git a/xwork-core/src/main/resources/xwork-2.0.dtd b/core/src/main/resources/xwork-2.0.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-2.0.dtd
rename to core/src/main/resources/xwork-2.0.dtd
diff --git a/xwork-core/src/main/resources/xwork-2.1.3.dtd b/core/src/main/resources/xwork-2.1.3.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-2.1.3.dtd
rename to core/src/main/resources/xwork-2.1.3.dtd
diff --git a/xwork-core/src/main/resources/xwork-2.1.dtd b/core/src/main/resources/xwork-2.1.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-2.1.dtd
rename to core/src/main/resources/xwork-2.1.dtd
diff --git a/xwork-core/src/main/resources/xwork-2.3.dtd b/core/src/main/resources/xwork-2.3.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-2.3.dtd
rename to core/src/main/resources/xwork-2.3.dtd
diff --git a/xwork-core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml
similarity index 100%
rename from xwork-core/src/main/resources/xwork-default.xml
rename to core/src/main/resources/xwork-default.xml
diff --git a/xwork-core/src/main/resources/xwork-validator-1.0.2.dtd b/core/src/main/resources/xwork-validator-1.0.2.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-validator-1.0.2.dtd
rename to core/src/main/resources/xwork-validator-1.0.2.dtd
diff --git a/xwork-core/src/main/resources/xwork-validator-1.0.3.dtd b/core/src/main/resources/xwork-validator-1.0.3.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-validator-1.0.3.dtd
rename to core/src/main/resources/xwork-validator-1.0.3.dtd
diff --git a/xwork-core/src/main/resources/xwork-validator-1.0.dtd b/core/src/main/resources/xwork-validator-1.0.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-validator-1.0.dtd
rename to core/src/main/resources/xwork-validator-1.0.dtd
diff --git a/xwork-core/src/main/resources/xwork-validator-config-1.0.dtd b/core/src/main/resources/xwork-validator-config-1.0.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-validator-config-1.0.dtd
rename to core/src/main/resources/xwork-validator-config-1.0.dtd
diff --git a/xwork-core/src/main/resources/xwork-validator-definition-1.0.dtd b/core/src/main/resources/xwork-validator-definition-1.0.dtd
similarity index 100%
rename from xwork-core/src/main/resources/xwork-validator-definition-1.0.dtd
rename to core/src/main/resources/xwork-validator-definition-1.0.dtd
diff --git a/xwork-core/src/test/java/PackagelessAction.java b/core/src/test/java/PackagelessAction.java
similarity index 100%
rename from xwork-core/src/test/java/PackagelessAction.java
rename to core/src/test/java/PackagelessAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionContextThreadLocalTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionContextThreadLocalTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ActionContextThreadLocalTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ActionContextThreadLocalTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/AnnotatedTestBean.java b/core/src/test/java/com/opensymphony/xwork2/AnnotatedTestBean.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/AnnotatedTestBean.java
rename to core/src/test/java/com/opensymphony/xwork2/AnnotatedTestBean.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java b/core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
rename to core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java
rename to core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
rename to core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java b/core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java
rename to core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/Foo.java b/core/src/test/java/com/opensymphony/xwork2/Foo.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/Foo.java
rename to core/src/test/java/com/opensymphony/xwork2/Foo.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/GenericsBean.java b/core/src/test/java/com/opensymphony/xwork2/GenericsBean.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/GenericsBean.java
rename to core/src/test/java/com/opensymphony/xwork2/GenericsBean.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java b/core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java
rename to core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
rename to core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
rename to core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/NestedAction.java b/core/src/test/java/com/opensymphony/xwork2/NestedAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/NestedAction.java
rename to core/src/test/java/com/opensymphony/xwork2/NestedAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java b/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java
rename to core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java b/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java
rename to core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java b/core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java
rename to core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java b/core/src/test/java/com/opensymphony/xwork2/SimpleAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java
rename to core/src/test/java/com/opensymphony/xwork2/SimpleAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java b/core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java
rename to core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java b/core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java
rename to core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java b/core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
rename to core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/TestBean.java b/core/src/test/java/com/opensymphony/xwork2/TestBean.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/TestBean.java
rename to core/src/test/java/com/opensymphony/xwork2/TestBean.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/TestChildBean.java b/core/src/test/java/com/opensymphony/xwork2/TestChildBean.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/TestChildBean.java
rename to core/src/test/java/com/opensymphony/xwork2/TestChildBean.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java b/core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
rename to core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java b/core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java
rename to core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
rename to core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java b/core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java
rename to core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java b/core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java
rename to core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java b/core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java
rename to core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/VoidResult.java b/core/src/test/java/com/opensymphony/xwork2/VoidResult.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/VoidResult.java
rename to core/src/test/java/com/opensymphony/xwork2/VoidResult.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java b/core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java
rename to core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java b/core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java
rename to core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java b/core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java b/core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java
rename to core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java b/core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java
rename to core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java
rename to core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java b/core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java b/core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java b/core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Bar.java b/core/src/test/java/com/opensymphony/xwork2/spring/Bar.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/Bar.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/Bar.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java b/core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java b/core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Foo.java b/core/src/test/java/com/opensymphony/xwork2/spring/Foo.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/Foo.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/Foo.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java b/core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java b/core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java
rename to core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware.java b/core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware.java
rename to core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware2.java b/core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationTestBean2.java b/core/src/test/java/com/opensymphony/xwork2/test/AnnotationTestBean2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationTestBean2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/AnnotationTestBean2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationUser.java b/core/src/test/java/com/opensymphony/xwork2/test/AnnotationUser.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationUser.java
rename to core/src/test/java/com/opensymphony/xwork2/test/AnnotationUser.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationUserMarker.java b/core/src/test/java/com/opensymphony/xwork2/test/AnnotationUserMarker.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationUserMarker.java
rename to core/src/test/java/com/opensymphony/xwork2/test/AnnotationUserMarker.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware.java b/core/src/test/java/com/opensymphony/xwork2/test/DataAware.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware.java
rename to core/src/test/java/com/opensymphony/xwork2/test/DataAware.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java b/core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/Equidae.java b/core/src/test/java/com/opensymphony/xwork2/test/Equidae.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/Equidae.java
rename to core/src/test/java/com/opensymphony/xwork2/test/Equidae.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java b/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java b/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java b/core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java b/core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java
rename to core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java b/core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java b/core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java
rename to core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java b/core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java
rename to core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/User.java b/core/src/test/java/com/opensymphony/xwork2/test/User.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/User.java
rename to core/src/test/java/com/opensymphony/xwork2/test/User.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java b/core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java
rename to core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotatedCat.java b/core/src/test/java/com/opensymphony/xwork2/util/AnnotatedCat.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotatedCat.java
rename to core/src/test/java/com/opensymphony/xwork2/util/AnnotatedCat.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java b/core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Bar.java b/core/src/test/java/com/opensymphony/xwork2/util/Bar.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Bar.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Bar.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/BarJunior.java b/core/src/test/java/com/opensymphony/xwork2/util/BarJunior.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/BarJunior.java
rename to core/src/test/java/com/opensymphony/xwork2/util/BarJunior.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Cat.java b/core/src/test/java/com/opensymphony/xwork2/util/Cat.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Cat.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Cat.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java b/core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Dog.java b/core/src/test/java/com/opensymphony/xwork2/util/Dog.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Dog.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Dog.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java b/core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Foo.java b/core/src/test/java/com/opensymphony/xwork2/util/Foo.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Foo.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Foo.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/FurColor.java b/core/src/test/java/com/opensymphony/xwork2/util/FurColor.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/FurColor.java
rename to core/src/test/java/com/opensymphony/xwork2/util/FurColor.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java b/core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Indexed.java b/core/src/test/java/com/opensymphony/xwork2/util/Indexed.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Indexed.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Indexed.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java b/core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java
rename to core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBean.java b/core/src/test/java/com/opensymphony/xwork2/util/MyBean.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBean.java
rename to core/src/test/java/com/opensymphony/xwork2/util/MyBean.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java b/core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java
rename to core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java b/core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java b/core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Owner.java b/core/src/test/java/com/opensymphony/xwork2/util/Owner.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Owner.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Owner.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/Tiger.java b/core/src/test/java/com/opensymphony/xwork2/util/Tiger.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/Tiger.java
rename to core/src/test/java/com/opensymphony/xwork2/util/Tiger.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java b/core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
rename to core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java b/core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java b/core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
rename to core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ActionValidatorManagerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/ActionValidatorManagerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/ActionValidatorManagerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationAction.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationAction.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java b/core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/MyValidator.java b/core/src/test/java/com/opensymphony/xwork2/validator/MyValidator.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/MyValidator.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/MyValidator.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
similarity index 100%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
diff --git a/xwork-core/src/test/resources/PackagelessAction.properties b/core/src/test/resources/PackagelessAction.properties
similarity index 100%
rename from xwork-core/src/test/resources/PackagelessAction.properties
rename to core/src/test/resources/PackagelessAction.properties
diff --git a/xwork-core/src/test/resources/includeTest.xml b/core/src/test/resources/includeTest.xml
similarity index 100%
rename from xwork-core/src/test/resources/includeTest.xml
rename to core/src/test/resources/includeTest.xml
diff --git a/core/src/test/resources/log4j2.xml b/core/src/test/resources/log4j2.xml
index 4b135395c..263585ef9 100644
--- a/core/src/test/resources/log4j2.xml
+++ b/core/src/test/resources/log4j2.xml
@@ -2,11 +2,11 @@
 <Configuration>
     <Appenders>
         <Console name="STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{ISO8601} %-5p [%F:%L] : %m%n"/>
+            <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
         </Console>
     </Appenders>
     <Loggers>
-        <Root level="warn">
+        <Root level="info">
             <AppenderRef ref="STDOUT"/>
         </Root>
     </Loggers>
diff --git a/xwork-core/src/test/resources/my-validators.xml b/core/src/test/resources/my-validators.xml
similarity index 100%
rename from xwork-core/src/test/resources/my-validators.xml
rename to core/src/test/resources/my-validators.xml
diff --git a/xwork-core/src/test/resources/myOther-validators.xml b/core/src/test/resources/myOther-validators.xml
similarity index 100%
rename from xwork-core/src/test/resources/myOther-validators.xml
rename to core/src/test/resources/myOther-validators.xml
diff --git a/core/src/test/resources/validators.xml b/core/src/test/resources/validators.xml
index 5e539bc6f..48369fa5d 100644
--- a/core/src/test/resources/validators.xml
+++ b/core/src/test/resources/validators.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
 <!DOCTYPE validators PUBLIC
         "-//Apache Struts//XWork Validator Config 1.0//EN"
         "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
@@ -38,4 +16,5 @@
     <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
     <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
     <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
+    <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
 </validators>
diff --git a/xwork-core/src/test/resources/xwork - jar.jar b/core/src/test/resources/xwork - jar.jar
similarity index 100%
rename from xwork-core/src/test/resources/xwork - jar.jar
rename to core/src/test/resources/xwork - jar.jar
diff --git a/xwork-core/src/test/resources/xwork - zip.zip b/core/src/test/resources/xwork - zip.zip
similarity index 100%
rename from xwork-core/src/test/resources/xwork - zip.zip
rename to core/src/test/resources/xwork - zip.zip
diff --git a/xwork-core/src/test/resources/xwork-1.0.dtd b/core/src/test/resources/xwork-1.0.dtd
similarity index 100%
rename from xwork-core/src/test/resources/xwork-1.0.dtd
rename to core/src/test/resources/xwork-1.0.dtd
diff --git a/xwork-core/src/test/resources/xwork-class-param-test.xml b/core/src/test/resources/xwork-class-param-test.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-class-param-test.xml
rename to core/src/test/resources/xwork-class-param-test.xml
diff --git a/xwork-core/src/test/resources/xwork-jar.jar b/core/src/test/resources/xwork-jar.jar
similarity index 100%
rename from xwork-core/src/test/resources/xwork-jar.jar
rename to core/src/test/resources/xwork-jar.jar
diff --git a/xwork-core/src/test/resources/xwork-param-test.xml b/core/src/test/resources/xwork-param-test.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-param-test.xml
rename to core/src/test/resources/xwork-param-test.xml
diff --git a/xwork-core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-proxyinvoke.xml
rename to core/src/test/resources/xwork-proxyinvoke.xml
diff --git a/xwork-core/src/test/resources/xwork-sample.xml b/core/src/test/resources/xwork-sample.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-sample.xml
rename to core/src/test/resources/xwork-sample.xml
diff --git a/xwork-core/src/test/resources/xwork-test-beans.xml b/core/src/test/resources/xwork-test-beans.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-test-beans.xml
rename to core/src/test/resources/xwork-test-beans.xml
diff --git a/xwork-core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-test-default.xml
rename to core/src/test/resources/xwork-test-default.xml
diff --git a/xwork-core/src/test/resources/xwork-test-validation.xml b/core/src/test/resources/xwork-test-validation.xml
similarity index 100%
rename from xwork-core/src/test/resources/xwork-test-validation.xml
rename to core/src/test/resources/xwork-test-validation.xml
diff --git a/xwork-core/src/test/resources/xwork-zip.zip b/core/src/test/resources/xwork-zip.zip
similarity index 100%
rename from xwork-core/src/test/resources/xwork-zip.zip
rename to core/src/test/resources/xwork-zip.zip
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index 1bd614e30..49dee3f07 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -31,8 +31,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.struts.xwork</groupId>
-            <artifactId>xwork-core</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>asm</groupId>
diff --git a/pom.xml b/pom.xml
index 73d959939..1b8474e24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,6 @@
 
     <modules>
         <module>bom</module>
-        <module>xwork-core</module>
         <module>core</module>
         <module>apps</module>
         <module>plugins</module>
@@ -356,11 +355,6 @@
                 <version>1.0.5</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.struts.xwork</groupId>
-                <artifactId>xwork-core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-core</artifactId>
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
deleted file mode 100644
index 3ba64615e..000000000
--- a/xwork-core/pom.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-parent</artifactId>
-        <version>2.5-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.struts.xwork</groupId>
-    <artifactId>xwork-core</artifactId>
-    <packaging>jar</packaging>
-    <name>XWork: Core</name>
-
-    <properties>
-        <currentVersion>${project.version}</currentVersion>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/resources</directory>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <argLine>-Duser.language=en -Duser.region=US</argLine>
-                    <properties>
-                        <property>
-                            <name>maven.testng.output.dir</name>
-                            <value>${project.basedir}/target/surefire-reports</value>
-                        </property>
-                    </properties>
-                    <useSystemClassLoader>false</useSystemClassLoader>
-                    <additionalClasspathElements>
-                        <element>${project.build.testOutputDirectory}/xwork-jar.jar</element>
-                        <element>${project.build.testOutputDirectory}/xwork-zip.zip</element>
-                        <element>${project.build.testOutputDirectory}/xwork - jar.jar</element>
-                        <element>${project.build.testOutputDirectory}/xwork - zip.zip</element>
-                    </additionalClasspathElements>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/XWorkTestCase.java</exclude>
-                        <exclude>**/TestBean.java</exclude>
-                        <exclude>**/TestBean2.java</exclude>
-                        <exclude>**/TestInterceptor.java</exclude>
-                        <exclude>**/AnnotatedTestBean.java</exclude>
-                        <exclude>**/ContainerImplTest.java</exclude>
-                        <exclude>**/URLUtilTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>com.opensymphony.xwork2.*</Export-Package>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <defaultGoal>install</defaultGoal>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>ognl</groupId>
-            <artifactId>ognl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <optional>true</optional>
-            <classifier>jdk15</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- SLF4J support -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Log4J2 support -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/xwork-core/src/main/resources/overview.html b/xwork-core/src/main/resources/overview.html
deleted file mode 100644
index 8a5dae3d4..000000000
--- a/xwork-core/src/main/resources/overview.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-This document is the API specification for <a href="http://wiki.opensymphony.com/space/XWork" target="_blank">XWork 2.0</a>.
-</body>
diff --git a/xwork-core/src/site/site.xml b/xwork-core/src/site/site.xml
deleted file mode 100644
index 07a667ec7..000000000
--- a/xwork-core/src/site/site.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<project name="Struts 2">
-    <skin>
-        <groupId>org.apache.maven.skins</groupId>
-        <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
-    </skin>
-    <bannerLeft>
-        <name>Apache Software Foundation</name>
-        <src>http://www.apache.org/images/asf-logo.gif</src>
-        <href>http://www.apache.org/</href>
-    </bannerLeft>
-    <bannerRight>
-        <name>Apache Struts</name>
-        <src>http://struts.apache.org/img/struts-logo.svg</src>
-        <href>http://struts.apache.org/</href>
-    </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
-    <body>
-        <links>
-            <item name="Apache" href="http://www.apache.org/"/>
-            <item name="Struts" href="http://struts.apache.org/"/>
-        </links>
-
-        <menu ref="parent"/>
-        <menu ref="reports"/>
-
-        <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
-        </footer>
-
-    </body>
-</project>
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java
deleted file mode 100644
index d22bd7477..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.entities;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.location.LocationImpl;
-
-/**
- * ActionConfigTest
- */
-public class ActionConfigTest extends XWorkTestCase {
-
-    public void testToString() {
-        ActionConfig cfg = new ActionConfig.Builder("", "bob", "foo.Bar")
-                .methodName("execute")
-                .location(new LocationImpl(null, "foo/xwork.xml", 10, 12))
-                .build();
-
-        assertTrue("Wrong toString(): "+cfg.toString(), 
-            "{ActionConfig bob (foo.Bar.execute()) - foo/xwork.xml:10:12}".equals(cfg.toString()));
-    }
-    
-    public void testToStringWithNoMethod() {
-        ActionConfig cfg = new ActionConfig.Builder("", "bob", "foo.Bar")
-                .location(new LocationImpl(null, "foo/xwork.xml", 10, 12))
-                .build();
-        
-        assertTrue("Wrong toString(): "+cfg.toString(),
-            "{ActionConfig bob (foo.Bar) - foo/xwork.xml:10:12}".equals(cfg.toString()));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
deleted file mode 100644
index e2f2868c2..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.entities;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-
-public class PackageConfigTest extends XWorkTestCase {
-
-    public void testFullDefaultInterceptorRef() {
-        PackageConfig cfg1 = new PackageConfig.Builder("pkg1")
-                .defaultInterceptorRef("ref1").build();
-        PackageConfig cfg2 = new PackageConfig.Builder("pkg2").defaultInterceptorRef("ref2").build();
-        PackageConfig cfg = new PackageConfig.Builder("pkg")
-                .addParent(cfg1)
-                .addParent(cfg2)
-                .build();
-        
-        assertEquals("ref2", cfg.getFullDefaultInterceptorRef());
-    }
-    
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
deleted file mode 100644
index e6de0b915..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * $Id$
- *
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.impl;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ActionConfigMatcherTest extends XWorkTestCase {
-
-    // ----------------------------------------------------- Instance Variables
-    private Map<String,ActionConfig> configMap;
-    private ActionConfigMatcher matcher;
-    
-    // ----------------------------------------------------- Setup and Teardown
-    @Override public void setUp() throws Exception {
-        super.setUp();
-        configMap = buildActionConfigMap();
-        matcher = new ActionConfigMatcher(configMap);
-    }
-
-    @Override public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    // ------------------------------------------------------- Individual Tests
-    // ---------------------------------------------------------- match()
-    public void testNoMatch() {
-        assertNull("ActionConfig shouldn't be matched", matcher.match("test"));
-    }
-
-    public void testNoWildcardMatch() {
-        assertNull("ActionConfig shouldn't be matched", matcher.match("noWildcard"));
-    }
-
-    public void testShouldMatch() {
-        ActionConfig matched = matcher.match("foo/class/method");
-
-        assertNotNull("ActionConfig should be matched", matched);
-        assertTrue("ActionConfig should have properties, had " +
-                matched.getParams().size(), matched.getParams().size() == 2);
-        assertTrue("ActionConfig should have interceptors",
-                matched.getInterceptors().size() == 1);
-        assertTrue("ActionConfig should have ex mappings",
-                matched.getExceptionMappings().size() == 1);
-        assertTrue("ActionConfig should have external refs",
-                matched.getExceptionMappings().size() == 1);
-        assertTrue("ActionConfig should have results",
-                matched.getResults().size() == 1);
-    }
-
-    public void testCheckSubstitutionsMatch() {
-        ActionConfig m = matcher.match("foo/class/method");
-
-        assertTrue("Class hasn't been replaced", "foo.bar.classAction".equals(m.getClassName()));
-        assertTrue("Method hasn't been replaced", "domethod".equals(m.getMethodName()));
-        assertTrue("Package isn't correct", "package-class".equals(m.getPackageName()));
-
-        assertTrue("First param isn't correct", "class".equals(m.getParams().get("first")));
-        assertTrue("Second param isn't correct", "method".equals(m.getParams().get("second")));
-        
-        ExceptionMappingConfig ex = m.getExceptionMappings().get(0);
-        assertTrue("Wrong name, was "+ex.getName(), "fooclass".equals(ex.getName()));
-        assertTrue("Wrong result", "successclass".equals(ex.getResult()));
-        assertTrue("Wrong exception", 
-                "java.lang.methodException".equals(ex.getExceptionClassName()));
-        assertTrue("First param isn't correct", "class".equals(ex.getParams().get("first")));
-        assertTrue("Second param isn't correct", "method".equals(ex.getParams().get("second")));
-        
-        ResultConfig result = m.getResults().get("successclass");
-        assertTrue("Wrong name, was "+result.getName(), "successclass".equals(result.getName()));
-        assertTrue("Wrong classname", "foo.method".equals(result.getClassName()));
-        assertTrue("First param isn't correct", "class".equals(result.getParams().get("first")));
-        assertTrue("Second param isn't correct", "method".equals(result.getParams().get("second")));
-        
-    }
-
-    public void testCheckMultipleSubstitutions() {
-        ActionConfig m = matcher.match("bar/class/method/more");
-
-        assertTrue("Method hasn't been replaced correctly: " + m.getMethodName(),
-            "doclass_class".equals(m.getMethodName()));
-    }
-    
-    public void testLooseMatch() {
-        configMap.put("*!*", configMap.get("bar/*/**"));
-        ActionConfigMatcher matcher = new ActionConfigMatcher(configMap, true);
-        
-        // exact match
-        ActionConfig m = matcher.match("foo/class/method");
-        assertNotNull("ActionConfig should be matched", m);
-        assertTrue("Class hasn't been replaced "+m.getClassName(), "foo.bar.classAction".equals(m.getClassName()));
-        assertTrue("Method hasn't been replaced", "domethod".equals(m.getMethodName()));
-        
-        // Missing last wildcard
-        m = matcher.match("foo/class");
-        assertNotNull("ActionConfig should be matched", m);
-        assertTrue("Class hasn't been replaced", "foo.bar.classAction".equals(m.getClassName()));
-        assertTrue("Method hasn't been replaced, "+m.getMethodName(), "do".equals(m.getMethodName()));
-        
-        // Simple mapping
-        m = matcher.match("class!method");
-        assertNotNull("ActionConfig should be matched", m);
-        assertTrue("Class hasn't been replaced, "+m.getPackageName(), "package-class".equals(m.getPackageName()));
-        assertTrue("Method hasn't been replaced", "method".equals(m.getParams().get("first")));
-        
-        // Simple mapping
-        m = matcher.match("class");
-        assertNotNull("ActionConfig should be matched", m);
-        assertTrue("Class hasn't been replaced", "package-class".equals(m.getPackageName()));
-        assertTrue("Method hasn't been replaced", "".equals(m.getParams().get("first")));
-        
-    }
-
-    private Map<String,ActionConfig> buildActionConfigMap() {
-        Map<String, ActionConfig> map = new HashMap<>();
-
-        HashMap<String, String> params = new HashMap<>();
-        params.put("first", "{1}");
-        params.put("second", "{2}");
-
-        ActionConfig config = new ActionConfig.Builder("package-{1}", "foo/*/*", "foo.bar.{1}Action")
-                .methodName("do{2}")
-                .addParams(params)
-                .addExceptionMapping(new ExceptionMappingConfig.Builder("foo{1}", "java.lang.{2}Exception", "success{1}")
-                        .addParams(new HashMap<>(params))
-                    .build())
-                .addInterceptor(new InterceptorMapping(null, null))
-                .addResultConfig(new ResultConfig.Builder("success{1}", "foo.{2}").addParams(params).build())
-                .build();
-        map.put("foo/*/*", config);
-        
-        config = new ActionConfig.Builder("package-{1}", "bar/*/**", "bar")
-                .methodName("do{1}_{1}")
-                .addParam("first", "{2}")
-                .build();
-        
-        map.put("bar/*/**", config);
-        
-        map.put("noWildcard", new ActionConfig.Builder("", "", "").build());
-
-        return map;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java
deleted file mode 100644
index e70f18daa..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.impl;
-
-import com.opensymphony.xwork2.util.WildcardHelper;
-import junit.framework.TestCase;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class NamespaceMatcherTest extends TestCase {
-
-    public void testMatch() {
-        Set<String> names = new HashSet<>();
-        names.add("/bar");
-        names.add("/foo/*/bar");
-        names.add("/foo/*");
-        names.add("/foo/*/jim/*");
-        NamespaceMatcher matcher = new NamespaceMatcher(new WildcardHelper(), names);
-        assertEquals(3, matcher.compiledPatterns.size());
-
-        assertNull(matcher.match("/asd"));
-        assertEquals("/foo/*", matcher.match("/foo/23").getPattern());
-        assertEquals("/foo/*/bar", matcher.match("/foo/23/bar").getPattern());
-        assertEquals("/foo/*/jim/*", matcher.match("/foo/23/jim/42").getPattern());
-        assertNull(matcher.match("/foo/23/asd"));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java
deleted file mode 100644
index f5cd83a8c..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.FileManagerFactory;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.impl.MockConfiguration;
-
-
-/**
- * ConfigurationTestBase
- *
- * @author Jason Carreira
- *         Created Jun 9, 2003 7:42:12 AM
- */
-public abstract class ConfigurationTestBase extends XWorkTestCase {
-
-    protected ConfigurationProvider buildConfigurationProvider(final String filename) {
-        configuration = new MockConfiguration();
-        ((MockConfiguration)configuration).selfRegister();
-        container = configuration.getContainer();
-
-        XmlConfigurationProvider prov = new XmlConfigurationProvider(filename, true);
-        prov.setObjectFactory(container.getInstance(ObjectFactory.class));
-        prov.setFileManagerFactory(container.getInstance(FileManagerFactory.class));
-        prov.init(configuration);
-        prov.loadPackages();
-        return prov;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java
deleted file mode 100644
index 914d9630f..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.entities.InterceptorConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.InterceptorStackConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-
-/**
- * <code>InterceptorBuilderTest</code>
- *
- * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @version $Id$
- */
-public class InterceptorBuilderTest extends XWorkTestCase {
-
-    ObjectFactory objectFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        objectFactory = container.getInstance(ObjectFactory.class);
-    }
-    
-    /**
-     * Try to test this
-     * <interceptor-ref name="interceptorStack1">
-     * <param name="interceptor1.param1">interceptor1_value1</param>
-     * <param name="interceptor1.param2">interceptor1_value2</param>
-     * <param name="interceptor2.param1">interceptor2_value1</param>
-     * <param name="interceptor2.param2">interceptor2_value2</param>
-     * </interceptor-ref>
-     *
-     * @throws Exception
-     */
-    public void testBuildInterceptor_1() throws Exception {
-        InterceptorStackConfig interceptorStackConfig1 = new InterceptorStackConfig.Builder("interceptorStack1").build();
-
-        InterceptorConfig interceptorConfig1 = new InterceptorConfig.Builder("interceptor1", "com.opensymphony.xwork2.config.providers.InterceptorBuilderTest$MockInterceptor1").build();
-
-        InterceptorConfig interceptorConfig2 = new InterceptorConfig.Builder("interceptor2", "com.opensymphony.xwork2.config.providers.InterceptorBuilderTest$MockInterceptor2").build();
-
-
-        PackageConfig packageConfig = new PackageConfig.Builder("package1").namespace("/namespace").addInterceptorConfig(interceptorConfig1).addInterceptorConfig(interceptorConfig2).addInterceptorStackConfig(interceptorStackConfig1).build();
-
-        List
-                interceptorMappings =
-                InterceptorBuilder.constructInterceptorReference(packageConfig, "interceptorStack1",
-                        new LinkedHashMap<String, String>() {
-                            private static final long serialVersionUID = -1358620486812957895L;
-
-                            {
-                                put("interceptor1.param1", "interceptor1_value1");
-                                put("interceptor1.param2", "interceptor1_value2");
-                                put("interceptor2.param1", "interceptor2_value1");
-                                put("interceptor2.param2", "interceptor2_value2");
-                            }
-                        },null,  objectFactory);
-
-        assertEquals(interceptorMappings.size(), 2);
-
-        assertEquals(((InterceptorMapping) interceptorMappings.get(0)).getName(), "interceptor1");
-        assertNotNull(((InterceptorMapping) interceptorMappings.get(0)).getInterceptor());
-        assertEquals(((InterceptorMapping) interceptorMappings.get(0)).getInterceptor().getClass(), MockInterceptor1.class);
-        assertEquals(((MockInterceptor1) ((InterceptorMapping) interceptorMappings.get(0)).getInterceptor()).getParam1(), "interceptor1_value1");
-        assertEquals(((MockInterceptor1) ((InterceptorMapping) interceptorMappings.get(0)).getInterceptor()).getParam2(), "interceptor1_value2");
-
-        assertEquals(((InterceptorMapping) interceptorMappings.get(1)).getName(), "interceptor2");
-        assertNotNull(((InterceptorMapping) interceptorMappings.get(1)).getInterceptor());
-        assertEquals(((InterceptorMapping) interceptorMappings.get(1)).getInterceptor().getClass(), MockInterceptor2.class);
-        assertEquals(((MockInterceptor2) ((InterceptorMapping) interceptorMappings.get(1)).getInterceptor()).getParam1(), "interceptor2_value1");
-        assertEquals(((MockInterceptor2) ((InterceptorMapping) interceptorMappings.get(1)).getInterceptor()).getParam2(), "interceptor2_value2");
-    }
-
-    /**
-     * Try to test this
-     * <interceptor-ref name="interceptorStack1">
-     * <param name="interceptorStack2.interceptor1.param1">interceptor1_value1</param>
-     * <param name="interceptorStack2.interceptor1.param2">interceptor1_value2</param>
-     * <param name="interceptorStack3.interceptor2.param1">interceptor2_value1</param>
-     * <param name="interceptorStack3.interceptor2.param2">interceptor2_value2</param>
-     * </interceptor-ref>
-     *
-     * @throws Exception
-     */
-    public void testBuildInterceptor_2() throws Exception {
-        InterceptorStackConfig interceptorStackConfig1 = new InterceptorStackConfig.Builder("interceptorStack1").build();
-
-        InterceptorStackConfig interceptorStackConfig2 = new InterceptorStackConfig.Builder("interceptorStack2").build();
-
-        InterceptorStackConfig interceptorStackConfig3 = new InterceptorStackConfig.Builder("interceptorStack3").build();
-
-        InterceptorConfig interceptorConfig1 = new InterceptorConfig.Builder("interceptor1", "com.opensymphony.xwork2.config.providers.InterceptorBuilderTest$MockInterceptor1").build();
-
-        InterceptorConfig interceptorConfig2 = new InterceptorConfig.Builder("interceptor2", "com.opensymphony.xwork2.config.providers.InterceptorBuilderTest$MockInterceptor2").build();
-
-
-        PackageConfig packageConfig = new PackageConfig.Builder("package1").namespace("/namspace").
-                addInterceptorConfig(interceptorConfig1).
-                addInterceptorConfig(interceptorConfig2).
-                addInterceptorStackConfig(interceptorStackConfig1).
-                addInterceptorStackConfig(interceptorStackConfig2).
-                addInterceptorStackConfig(interceptorStackConfig3).build();
-
-        List interceptorMappings = InterceptorBuilder.constructInterceptorReference(packageConfig, "interceptorStack1",
-                new LinkedHashMap<String, String>() {
-                    private static final long serialVersionUID = -5819935102242042570L;
-
-                    {
-                        put("interceptorStack2.interceptor1.param1", "interceptor1_value1");
-                        put("interceptorStack2.interceptor1.param2", "interceptor1_value2");
-                        put("interceptorStack3.interceptor2.param1", "interceptor2_value1");
-                        put("interceptorStack3.interceptor2.param2", "interceptor2_value2");
-                    }
-                }, null, objectFactory);
-
-        assertEquals(interceptorMappings.size(), 2);
-
-        assertEquals(((InterceptorMapping) interceptorMappings.get(0)).getName(), "interceptor1");
-        assertNotNull(((InterceptorMapping) interceptorMappings.get(0)).getInterceptor());
-        assertEquals(((InterceptorMapping) interceptorMappings.get(0)).getInterceptor().getClass(), MockInterceptor1.class);
-        assertEquals(((MockInterceptor1) ((InterceptorMapping) interceptorMappings.get(0)).getInterceptor()).getParam1(), "interceptor1_value1");
-        assertEquals(((MockInterceptor1) ((InterceptorMapping) interceptorMappings.get(0)).getInterceptor()).getParam2(), "interceptor1_value2");
-
-        assertEquals(((InterceptorMapping) interceptorMappings.get(1)).getName(), "interceptor2");
-        assertNotNull(((InterceptorMapping) interceptorMappings.get(1)).getInterceptor());
-        assertEquals(((InterceptorMapping) interceptorMappings.get(1)).getInterceptor().getClass(), MockInterceptor2.class);
-        assertEquals(((MockInterceptor2) ((InterceptorMapping) interceptorMappings.get(1)).getInterceptor()).getParam1(), "interceptor2_value1");
-        assertEquals(((MockInterceptor2) ((InterceptorMapping) interceptorMappings.get(1)).getInterceptor()).getParam2(), "interceptor2_value2");
-    }
-
-    /**
-     * Try to test this
-     * <interceptor-ref name="interceptorStack1">
-     * <param name="interceptorStack2.interceptorStack3.interceptorStack4.interceptor1.param1">interceptor1_value1</param>
-     * <param name="interceptorStack2.interceptorStack3.interceptorStack4.interceptor1.param2">interceptor1_value2</param>
-     * <param name="interceptorStack5.interceptor2.param1">interceptor2_value1</param>
-     * <param name="interceptorStack5.interceptor2.param2">interceptor2_value2</param>
-     * </interceptor-ref>
-     *
-     * @throws Exception
-     */
-    public void testBuildInterceptor_3() throws Exception {
-        InterceptorConfig interceptorConfig1 = new InterceptorConfig.Builder("interceptor1", "com.opensymphony.xwork2.config.providers.InterceptorBuilderTest$MockInterceptor1").build();
-
-        InterceptorConfig interceptorConfig2 = new InterceptorConfig.Builder("interceptor2", "com.opensymphony.xwork2.config.providers.InterceptorBuilderTest$MockInterceptor2").build();
-
-
-        InterceptorStackConfig interceptorStackConfig1 = new InterceptorStackConfig.Builder("interceptorStack1").build();
-
-
-        InterceptorStackConfig interceptorStackConfig2 = new InterceptorStackConfig.Builder("interceptorStack2").build();
-
-
-        InterceptorStackConfig interceptorStackConfig3 = new InterceptorStackConfig.Builder("interceptorStack3").build();
-
-
-        InterceptorStackConfig interceptorStackConfig4 = new InterceptorStackConfig.Builder("interceptorStack4").build();
-
-
-        InterceptorStackConfig interceptorStackConfig5 = new InterceptorStackConfig.Builder("interceptorStack5").build();
-
-
-
-        PackageConfig packageConfig = new PackageConfig.Builder("package1").
-                addInterceptorConfig(interceptorConfig1).
-                addInterceptorConfig(interceptorConfig2).
-                addInterceptorStackConfig(interceptorStackConfig1).
-                addInterceptorStackConfig(interceptorStackConfig2).
-                addInterceptorStackConfig(interceptorStackConfig3).
-                addInterceptorStackConfig(interceptorStackConfig4).
-                addInterceptorStackConfig(interceptorStackConfig5).build();
-
-
-        List interceptorMappings = InterceptorBuilder.constructInterceptorReference(
-                packageConfig, "interceptorStack1",
-                new LinkedHashMap<String, String>() {
-                    private static final long serialVersionUID = 4675809753780875525L;
-
-                    {
-                        put("interceptorStack2.interceptorStack3.interceptorStack4.interceptor1.param1", "interceptor1_value1");
-                        put("interceptorStack2.interceptorStack3.interceptorStack4.interceptor1.param2", "interceptor1_value2");
-                        put("interceptorStack5.interceptor2.param1", "interceptor2_value1");
-                        put("interceptorStack5.interceptor2.param2", "interceptor2_value2");
-                    }
-                }, null, objectFactory);
-
-        assertEquals(interceptorMappings.size(), 2);
-
-        assertEquals(((InterceptorMapping) interceptorMappings.get(0)).getName(), "interceptor1");
-        assertNotNull(((InterceptorMapping) interceptorMappings.get(0)).getInterceptor());
-        assertEquals(((InterceptorMapping) interceptorMappings.get(0)).getInterceptor().getClass(), MockInterceptor1.class);
-        assertEquals(((MockInterceptor1) ((InterceptorMapping) interceptorMappings.get(0)).getInterceptor()).getParam1(), "interceptor1_value1");
-        assertEquals(((MockInterceptor1) ((InterceptorMapping) interceptorMappings.get(0)).getInterceptor()).getParam2(), "interceptor1_value2");
-
-        assertEquals(((InterceptorMapping) interceptorMappings.get(1)).getName(), "interceptor2");
-        assertNotNull(((InterceptorMapping) interceptorMappings.get(1)).getInterceptor());
-        assertEquals(((InterceptorMapping) interceptorMappings.get(1)).getInterceptor().getClass(), MockInterceptor2.class);
-        assertEquals(((MockInterceptor2) ((InterceptorMapping) interceptorMappings.get(1)).getInterceptor()).getParam1(), "interceptor2_value1");
-        assertEquals(((MockInterceptor2) ((InterceptorMapping) interceptorMappings.get(1)).getInterceptor()).getParam2(), "interceptor2_value2");
-    }
-
-
-    public static class MockInterceptor1 implements Interceptor {
-        private static final long serialVersionUID = 2939902550126175874L;
-        private String param1;
-        private String param2;
-
-        public void setParam1(String param1) {
-            this.param1 = param1;
-        }
-
-        public String getParam1() {
-            return this.param1;
-        }
-
-        public void setParam2(String param2) {
-            this.param2 = param2;
-        }
-
-        public String getParam2() {
-            return this.param2;
-        }
-
-        public void destroy() {
-        }
-
-        public void init() {
-        }
-
-        public String intercept(ActionInvocation invocation) throws Exception {
-            return invocation.invoke();
-        }
-    }
-
-    public static class MockInterceptor2 implements Interceptor {
-        private static final long serialVersionUID = 267427973306989618L;
-        private String param1;
-        private String param2;
-
-        public void setParam1(String param1) {
-            this.param1 = param1;
-        }
-
-        public String getParam1() {
-            return this.param1;
-        }
-
-        public void setParam2(String param2) {
-            this.param2 = param2;
-        }
-
-        public String getParam2() {
-            return this.param2;
-        }
-
-        public void destroy() {
-        }
-
-        public void init() {
-        }
-
-        public String intercept(ActionInvocation invocation) throws Exception {
-            return invocation.invoke();
-        }
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java
deleted file mode 100644
index 89112684a..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-
-/**
- * 
- * @author tm_jee
- * @version $Date$ $Id$
- */
-public class InterceptorForTestPurpose implements Interceptor {
-
-	private String paramOne;
-	private String paramTwo;
-	
-	public String getParamOne() { return paramOne; }
-	public void setParamOne(String paramOne) { this.paramOne = paramOne; }
-	
-	public String getParamTwo() { return paramTwo; }
-	public void setParamTwo(String paramTwo) { this.paramTwo = paramTwo; }
-	
-	public void destroy() {
-	}
-
-	public void init() {
-	}
-
-	public String intercept(ActionInvocation invocation) throws Exception {
-		return invocation.invoke();
-	}
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java
deleted file mode 100644
index 22d748b2c..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import com.opensymphony.xwork2.interceptor.StaticParametersInterceptor;
-import com.opensymphony.xwork2.mock.MockResult;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.validator.ValidationInterceptor;
-
-import java.util.*;
-
-
-/**
- * MockConfigurationProvider provides a simple configuration class without the need for xml files, etc. for simple testing.
- *
- * @author $author$
- * @version $Revision$
- */
-public class MockConfigurationProvider implements ConfigurationProvider {
-
-    public static final String FOO_ACTION_NAME = "foo";
-    public static final String MODEL_DRIVEN_PARAM_TEST = "modelParamTest";
-    public static final String MODEL_DRIVEN_PARAM_FILTER_TEST  = "modelParamFilterTest";
-    public static final String PARAM_INTERCEPTOR_ACTION_NAME = "parametersInterceptorTest";
-    public static final String VALIDATION_ACTION_NAME = "validationInterceptorTest";
-    public static final String VALIDATION_ALIAS_NAME = "validationAlias";
-    public static final String VALIDATION_SUBPROPERTY_NAME = "subproperty";
-    public static final String EXPRESSION_VALIDATION_ACTION = "expressionValidationAction";
-
-    private static final Map<String,String> EMPTY_STRING_MAP = Collections.emptyMap();
-
-    private Configuration configuration;
-    private Map<String,String> params;
-    private ObjectFactory objectFactory;
-
-    public MockConfigurationProvider() {}
-    public MockConfigurationProvider(Map<String,String> params) {
-        this.params = params;
-    }
-
-    /**
-     * Allows the configuration to clean up any resources used
-     */
-    public void destroy() {
-    }
-    
-    public void init(Configuration config) {
-        this.configuration = config;
-    }
-    
-    @Inject
-    public void setObjectFactory(ObjectFactory fac) {
-        this.objectFactory = fac;
-    }
-
-    public void loadPackages() {
-        
-        PackageConfig.Builder defaultPackageContext = new PackageConfig.Builder("defaultPackage");
-        Map<String, String> params = new HashMap<>();
-        params.put("bar", "5");
-
-        Map<String, ResultConfig> results = new HashMap<>();
-        Map<String, String> successParams = new HashMap<>();
-        successParams.put("actionName", "bar");
-        results.put("success", new ResultConfig.Builder("success", ActionChainResult.class.getName()).addParams(successParams).build());
-
-        ActionConfig fooActionConfig = new ActionConfig.Builder("defaultPackage", FOO_ACTION_NAME, SimpleAction.class.getName())
-            .addResultConfig(new ResultConfig.Builder(Action.ERROR, MockResult.class.getName()).build())
-            .build();
-        defaultPackageContext.addActionConfig(FOO_ACTION_NAME, fooActionConfig);
-
-        results = new HashMap<>();
-        successParams = new HashMap<>();
-        successParams.put("actionName", "bar");
-        results.put("success", new ResultConfig.Builder("success", ActionChainResult.class.getName()).addParams(successParams).build());
-
-        List<InterceptorMapping> interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("params", new ParametersInterceptor()));
-
-        ActionConfig paramInterceptorActionConfig = new ActionConfig.Builder("defaultPackage", PARAM_INTERCEPTOR_ACTION_NAME, SimpleAction.class.getName())
-            .addResultConfig(new ResultConfig.Builder(Action.ERROR, MockResult.class.getName()).build())
-            .addInterceptors(interceptors)
-            .build();
-        defaultPackageContext.addActionConfig(PARAM_INTERCEPTOR_ACTION_NAME, paramInterceptorActionConfig);
-
-        interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("model", 
-                objectFactory.buildInterceptor(new InterceptorConfig.Builder("model", ModelDrivenInterceptor.class.getName()).build(), EMPTY_STRING_MAP)));
-        interceptors.add(new InterceptorMapping("params",
-                objectFactory.buildInterceptor(new InterceptorConfig.Builder("model", ParametersInterceptor.class.getName()).build(), EMPTY_STRING_MAP)));
-
-        ActionConfig modelParamActionConfig = new ActionConfig.Builder("defaultPackage", MODEL_DRIVEN_PARAM_TEST, ModelDrivenAction.class.getName())
-            .addInterceptors(interceptors)
-            .addResultConfig(new ResultConfig.Builder(Action.SUCCESS, MockResult.class.getName()).build())
-            .build();
-        defaultPackageContext.addActionConfig(MODEL_DRIVEN_PARAM_TEST, modelParamActionConfig);
-        
-        //List paramFilterInterceptor=new ArrayList();
-        //paramFilterInterceptor.add(new ParameterFilterInterC)
-        //ActionConfig modelParamFilterActionConfig = new ActionConfig(null, ModelDrivenAction.class, null, null, interceptors);
-
-
-        results = new HashMap<>();
-        successParams = new HashMap<>();
-        successParams.put("actionName", "bar");
-        results.put("success", new ResultConfig.Builder("success", ActionChainResult.class.getName()).addParams(successParams).build());
-        results.put(Action.ERROR, new ResultConfig.Builder(Action.ERROR, MockResult.class.getName()).build());
-
-        interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("staticParams", 
-                objectFactory.buildInterceptor(new InterceptorConfig.Builder("model", StaticParametersInterceptor.class.getName()).build(), EMPTY_STRING_MAP)));
-        interceptors.add(new InterceptorMapping("model", 
-                objectFactory.buildInterceptor(new InterceptorConfig.Builder("model", ModelDrivenInterceptor.class.getName()).build(), EMPTY_STRING_MAP)));
-        interceptors.add(new InterceptorMapping("params", 
-                objectFactory.buildInterceptor(new InterceptorConfig.Builder("model", ParametersInterceptor.class.getName()).build(), EMPTY_STRING_MAP)));
-        interceptors.add(new InterceptorMapping("validation", 
-                objectFactory.buildInterceptor(new InterceptorConfig.Builder("model", ValidationInterceptor.class.getName()).build(), EMPTY_STRING_MAP)));
-
-        //Explicitly set an out-of-range date for DateRangeValidatorTest
-        params = new HashMap<>();
-        ActionConfig validationActionConfig = new ActionConfig.Builder("defaultPackage", VALIDATION_ACTION_NAME, SimpleAction.class.getName())
-            .addInterceptors(interceptors)
-            .addParams(params)
-            .addResultConfigs(results)
-            .build();
-        defaultPackageContext.addActionConfig(VALIDATION_ACTION_NAME, validationActionConfig);
-        defaultPackageContext.addActionConfig(VALIDATION_ALIAS_NAME,
-                new ActionConfig.Builder(validationActionConfig).name(VALIDATION_ALIAS_NAME).build());
-        defaultPackageContext.addActionConfig(VALIDATION_SUBPROPERTY_NAME,
-                new ActionConfig.Builder(validationActionConfig).name(VALIDATION_SUBPROPERTY_NAME).build());
-
-
-        params = new HashMap<>();
-        ActionConfig percentageActionConfig = new ActionConfig.Builder("defaultPackage", "percentage", SimpleAction.class.getName())
-                .addParams(params)
-                .addResultConfigs(results)
-                .addInterceptors(interceptors)
-                .build();
-        defaultPackageContext.addActionConfig(percentageActionConfig.getName(), percentageActionConfig);
-
-        // We need this actionconfig to be the final destination for action chaining
-        ActionConfig barActionConfig = new ActionConfig.Builder("defaultPackage", "bar", SimpleAction.class.getName())
-                .addResultConfig(new ResultConfig.Builder(Action.ERROR, MockResult.class.getName()).build())
-                .build();
-        defaultPackageContext.addActionConfig(barActionConfig.getName(), barActionConfig);
-
-        ActionConfig expressionValidationActionConfig = new ActionConfig.Builder("defaultPackage", EXPRESSION_VALIDATION_ACTION, SimpleAction.class.getName())
-                .addInterceptors(interceptors)
-                .addResultConfigs(results)
-                .build();
-        defaultPackageContext.addActionConfig(EXPRESSION_VALIDATION_ACTION, expressionValidationActionConfig);
-
-        configuration.addPackageConfig("defaultPackage", defaultPackageContext.build());
-    }
-
-    /**
-     * Tells whether the ConfigurationProvider should reload its configuration
-     *
-     * @return false
-     */
-    public boolean needsReload() {
-        return false;
-    }
-
-    public void register(ContainerBuilder builder, LocatableProperties props) throws ConfigurationException {
-        if (params != null) {
-            for (String key : params.keySet()) {
-                props.setProperty(key, params.get(key));
-            }
-        }
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java
deleted file mode 100644
index 8f1435d9d..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * Action with no public constructor taking no args.
- * <p/>
- * Used for unit test of {@link com.opensymphony.xwork2.config.providers.XmlConfigurationProvider}.
- *
- * @author Claus Ibsen
- */
-public class NoNoArgsConstructorAction implements Action {
-
-    private int foo;
-
-    public NoNoArgsConstructorAction(int foo) {
-        this.foo = foo;
-    }
-
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java
deleted file mode 100644
index 640a17140..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * Action with nu public constructor.
- * <p/>
- * Used for unit test of {@link XmlConfigurationProvider}.
- *
- * @author Claus Ibsen
- */
-public class PrivateConstructorAction implements Action {
-
-    private int foo;
-
-    private PrivateConstructorAction() {
-        // should be private, no constructor
-    }
-
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
-
-    public void setFoo(int foo) {
-        this.foo = foo;
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
deleted file mode 100644
index 494a16c0f..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.UnknownHandler;
-import com.opensymphony.xwork2.XWorkException;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-
-public class SomeUnknownHandler implements UnknownHandler{
-    private ActionConfig actionConfig;
-    private String actionMethodResult;
-
-    public ActionConfig handleUnknownAction(String namespace, String actionName) throws XWorkException {
-        return actionConfig;
-    }
-
-    public Object handleUnknownActionMethod(Object action, String methodName) throws NoSuchMethodException {
-        return actionMethodResult;
-    }
-
-    public Result handleUnknownResult(ActionContext actionContext, String actionName, ActionConfig actionConfig,
-            String resultCode) throws XWorkException {
-        return null;
-    }
-
-    public void setActionConfig(ActionConfig actionConfig) {
-        this.actionConfig = actionConfig;
-    }
-
-    public void setActionMethodResult(String actionMethodResult) {
-        this.actionMethodResult = actionMethodResult;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
deleted file mode 100644
index 218118163..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.interceptor.TimerInterceptor;
-import com.opensymphony.xwork2.mock.MockInterceptor;
-import com.opensymphony.xwork2.mock.MockResult;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @author Mike
- * @author Rainer Hermanns
- */
-public class XmlConfigurationProviderActionsTest extends ConfigurationTestBase {
-
-    private List<InterceptorMapping> interceptors;
-    private List<ExceptionMappingConfig> exceptionMappings;
-    private Map<String, String> params;
-    private Map<String, ResultConfig> results;
-    private ObjectFactory objectFactory;
-
-
-    public void testActions() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // setup expectations
-        // bar action is very simple, just two params
-        params.put("foo", "17");
-        params.put("bar", "23");
-        params.put("testXW412", "foo.jspa?fooID=${fooID}&something=bar");
-        params.put("testXW412Again", "something");
-
-
-        ActionConfig barAction = new ActionConfig.Builder("", "Bar", SimpleAction.class.getName())
-                .addParams(params).build();
-
-        // foo action is a little more complex, two params, a result and an interceptor stack
-        results = new HashMap<>();
-        params = new HashMap<>();
-        params.put("foo", "18");
-        params.put("bar", "24");
-        results.put("success", new ResultConfig.Builder("success", MockResult.class.getName()).build());
-
-        InterceptorConfig timerInterceptorConfig = new InterceptorConfig.Builder("timer", TimerInterceptor.class.getName()).build();
-        interceptors.add(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptorConfig, new HashMap<String, String>())));
-
-        ActionConfig fooAction = new ActionConfig.Builder("", "Foo", SimpleAction.class.getName())
-                .addParams(params)
-                .addResultConfigs(results)
-                .addInterceptors(interceptors)
-                .build();
-
-        // wildcard action is simple wildcard example
-        results = new HashMap<>();
-        results.put("*", new ResultConfig.Builder("*", MockResult.class.getName()).build());
-
-        ActionConfig wildcardAction = new ActionConfig.Builder("", "WildCard", SimpleAction.class.getName())
-                .addResultConfigs(results)
-                .addInterceptors(interceptors)
-                .build();
-
-        // fooBar action is a little more complex, two params, a result and an interceptor stack
-        params = new HashMap<String, String>();
-        params.put("foo", "18");
-        params.put("bar", "24");
-        results = new HashMap<>();
-        results.put("success", new ResultConfig.Builder("success", MockResult.class.getName()).build());
-
-        ExceptionMappingConfig exceptionConfig = new ExceptionMappingConfig.Builder("runtime", "java.lang.RuntimeException", "exception")
-                .build();
-        exceptionMappings.add(exceptionConfig);
-
-        ActionConfig fooBarAction = new ActionConfig.Builder("", "FooBar", SimpleAction.class.getName())
-                .addParams(params)
-                .addResultConfigs(results)
-                .addInterceptors(interceptors)
-                .addExceptionMappings(exceptionMappings)
-                .build();
-
-        // TestInterceptorParam action tests that an interceptor worked
-        HashMap<String, String> interceptorParams = new HashMap<>();
-        interceptorParams.put("expectedFoo", "expectedFooValue");
-        interceptorParams.put("foo", MockInterceptor.DEFAULT_FOO_VALUE);
-
-        InterceptorConfig mockInterceptorConfig = new InterceptorConfig.Builder("test", MockInterceptor.class.getName()).build();
-        interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("test", objectFactory.buildInterceptor(mockInterceptorConfig, interceptorParams)));
-
-        ActionConfig intAction = new ActionConfig.Builder("", "TestInterceptorParam", SimpleAction.class.getName())
-                .addInterceptors(interceptors)
-                .build();
-
-        // TestInterceptorParamOverride action tests that an interceptor with a param override worked
-        interceptorParams = new HashMap<>();
-        interceptorParams.put("expectedFoo", "expectedFooValue");
-        interceptorParams.put("foo", "foo123");
-        interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("test", objectFactory.buildInterceptor(mockInterceptorConfig, interceptorParams)));
-
-        ActionConfig intOverAction = new ActionConfig.Builder("", "TestInterceptorParamOverride", SimpleAction.class.getName())
-                .addInterceptors(interceptors)
-                .build();
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(7, actionConfigs.size());
-        assertEquals(barAction, actionConfigs.get("Bar"));
-        assertEquals(fooAction, actionConfigs.get("Foo"));
-        assertEquals(wildcardAction, actionConfigs.get("WildCard"));
-        assertEquals(fooBarAction, actionConfigs.get("FooBar"));
-        assertEquals(intAction, actionConfigs.get("TestInterceptorParam"));
-        assertEquals(intOverAction, actionConfigs.get("TestInterceptorParamOverride"));
-    }
-
-    public void testInvalidActions() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml";
-
-        try {
-            ConfigurationProvider provider = buildConfigurationProvider(filename);
-            fail("Should have thrown an exception");
-        } catch (ConfigurationException ex) {
-            // it worked correctly
-        }
-    }
-
-    public void testPackageDefaultClassRef() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml";
-        final String testDefaultClassName = "com.opensymphony.xwork2.UserSpecifiedDefaultAction";
-
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // setup expectations
-        params.put("foo", "17");
-        params.put("bar", "23");
-
-        ActionConfig barWithPackageDefaultClassRefConfig =
-                new ActionConfig.Builder("", "Bar", "").addParams(params).build();
-
-        // execute the configuration
-        provider.init(configuration);
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(1, actionConfigs.size());
-        assertEquals(barWithPackageDefaultClassRefConfig, actionConfigs.get("Bar"));
-    }
-
-    public void testDefaultActionClass() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
-        final String testDefaultClassName = "com.opensymphony.xwork2.ActionSupport";
-
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // setup expectations
-        params.put("foo", "17");
-        params.put("bar", "23");
-
-        ActionConfig barWithoutClassNameConfig =
-                new ActionConfig.Builder("", "BarWithoutClassName", "").addParams(params).build();
-
-        // execute the configuration
-        provider.init(configuration);
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(7, actionConfigs.size());
-        assertEquals(barWithoutClassNameConfig, actionConfigs.get("BarWithoutClassName"));
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        params = new HashMap<>();
-        results = new HashMap<>();
-        interceptors = new ArrayList<>();
-        exceptionMappings = new ArrayList<>();
-        this.objectFactory = container.getInstance(ObjectFactory.class);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
deleted file mode 100644
index 6a55e75a8..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-
-import java.util.Map;
-
-/**
- * @author John Lindal
- */
-public class XmlConfigurationProviderAllowedMethodsTest extends ConfigurationTestBase {
-
-    public void testDefaultAllowedMethods() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(5, actionConfigs.size());
-
-        ActionConfig action = (ActionConfig) actionConfigs.get("Default");
-        assertEquals(1, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertTrue(action.isAllowedMethod("bar"));
-        assertTrue(action.isAllowedMethod("baz"));
-        assertTrue(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Boring");
-        assertEquals(0, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertFalse(action.isAllowedMethod("foo"));
-        assertFalse(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Foo");
-        assertEquals(1, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertFalse(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Bar");
-        assertEquals(2, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertTrue(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Baz");
-        assertEquals(2, action.getAllowedMethods().size());
-        assertFalse(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertTrue(action.isAllowedMethod("bar"));
-        assertTrue(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-    }
-
-    public void testStrictAllowedMethods() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("strict");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(5, actionConfigs.size());
-
-        ActionConfig action = (ActionConfig) actionConfigs.get("Default");
-        assertEquals(0, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertFalse(action.isAllowedMethod("foo"));
-        assertFalse(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Boring");
-        assertEquals(0, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertFalse(action.isAllowedMethod("foo"));
-        assertFalse(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Foo");
-        assertEquals(1, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertFalse(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Bar");
-        assertEquals(2, action.getAllowedMethods().size());
-        assertTrue(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertTrue(action.isAllowedMethod("bar"));
-        assertFalse(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-
-        action = (ActionConfig) actionConfigs.get("Baz");
-        assertEquals(2, action.getAllowedMethods().size());
-        assertFalse(action.isAllowedMethod("execute"));
-        assertTrue(action.isAllowedMethod("foo"));
-        assertTrue(action.isAllowedMethod("bar"));
-        assertTrue(action.isAllowedMethod("baz"));
-        assertFalse(action.isAllowedMethod("xyz"));
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
deleted file mode 100644
index 232efd3db..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.mock.MockResult;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * User: Matthew E. Porter (matthew dot porter at metissian dot com)
- * Date: Aug 15, 2005
- * Time: 2:05:36 PM
- */
-public class XmlConfigurationProviderExceptionMappingsTest extends ConfigurationTestBase {
-
-    public void testActions() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        List<ExceptionMappingConfig> exceptionMappings = new ArrayList<>();
-        HashMap<String, String> parameters = new HashMap<>();
-        HashMap<String, ResultConfig> results = new HashMap<>();
-
-        exceptionMappings.add(
-                new ExceptionMappingConfig.Builder("spooky-result", "com.opensymphony.xwork2.SpookyException", "spooky-result")
-                    .build());
-        results.put("spooky-result", new ResultConfig.Builder("spooky-result", MockResult.class.getName()).build());
-
-        Map<String, String> resultParams = new HashMap<>();
-        resultParams.put("actionName", "bar.vm");
-        results.put("specificLocationResult",
-                new ResultConfig.Builder("specificLocationResult", ActionChainResult.class.getName())
-                    .addParams(resultParams)
-                    .build());
-
-        ActionConfig expectedAction = new ActionConfig.Builder("default", "Bar", SimpleAction.class.getName())
-            .addParams(parameters)
-            .addResultConfigs(results)
-            .addExceptionMappings(exceptionMappings)
-            .build();
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(1, actionConfigs.size());
-
-        ActionConfig action = (ActionConfig) actionConfigs.get("Bar");
-        assertEquals(expectedAction, action);
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
deleted file mode 100644
index e4553df88..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-
-/**
- * <code>XmlConfigurationProviderGlobalResultInheritenceTest</code>
- *
- * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @author tm_jee
- * @version $Id$
- */
-public class XmlConfigurationProviderGlobalResultInheritenceTest extends ConfigurationTestBase {
-
-    public void testGlobalResultInheritenceTest() throws Exception {
-        ConfigurationProvider provider = buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml");
-
-        ConfigurationManager configurationManager = new ConfigurationManager();
-        configurationManager.addContainerProvider(new XWorkConfigurationProvider());
-        configurationManager.addContainerProvider(provider);
-        Configuration configuration = configurationManager.getConfiguration();
-
-        ActionConfig parentActionConfig = configuration.getRuntimeConfiguration().getActionConfig("/base", "parentAction");
-        ActionConfig anotherActionConfig = configuration.getRuntimeConfiguration().getActionConfig("/base", "anotherAction");
-        ActionConfig childActionConfig = configuration.getRuntimeConfiguration().getActionConfig("/base", "childAction");
-
-        ResultConfig parentResultConfig1 = parentActionConfig.getResults().get("mockResult1");
-        ResultConfig parentResultConfig2 = parentActionConfig.getResults().get("mockResult2");
-        ResultConfig anotherResultConfig1 = anotherActionConfig.getResults().get("mockResult1");
-        ResultConfig anotherResultConfig2 = anotherActionConfig.getResults().get("mockResult2");
-        ResultConfig childResultConfig1 = childActionConfig.getResults().get("mockResult1");
-        ResultConfig childResultConfig2 = childActionConfig.getResults().get("mockResult2");
-
-        System.out.println(parentResultConfig1.getParams().get("identity"));
-        System.out.println(parentResultConfig2.getParams().get("identity"));
-        System.out.println(anotherResultConfig1.getParams().get("identity"));
-        System.out.println(anotherResultConfig2.getParams().get("identity"));
-        System.out.println(childResultConfig1.getParams().get("identity"));
-        System.out.println(childResultConfig2.getParams().get("identity"));
-
-        assertFalse(parentResultConfig1 == anotherResultConfig1);
-        assertFalse(parentResultConfig2 == anotherResultConfig2);
-
-        assertFalse(parentResultConfig1 == childResultConfig1);
-        assertTrue(parentResultConfig2 == childResultConfig2);
-    }
-}
-
-
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java
deleted file mode 100644
index 250dd64c1..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-import com.opensymphony.xwork2.util.fs.DefaultFileManager;
-import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author tm_jee
- * @version $Date$ $Id$
- */
-public class XmlConfigurationProviderInterceptorParamOverridingTest extends XWorkTestCase {
-
-    public void testInterceptorParamOveriding() throws Exception {
-        DefaultConfiguration conf = new DefaultConfiguration();
-        final XmlConfigurationProvider p = new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml");
-        DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
-        factory.setContainer(container);
-        factory.setFileManager(new DefaultFileManager());
-        p.setFileManagerFactory(factory);
-        conf.reload(new ArrayList<ConfigurationProvider>() {
-            {
-                add(new XWorkConfigurationProvider());
-                add(p);
-            }
-        });
-
-        RuntimeConfiguration rtConf = conf.getRuntimeConfiguration();
-
-        ActionConfig actionOne = rtConf.getActionConfig("", "actionOne");
-        ActionConfig actionTwo = rtConf.getActionConfig("", "actionTwo");
-
-        List<InterceptorMapping> actionOneInterceptors = actionOne.getInterceptors();
-        List<InterceptorMapping> actionTwoInterceptors = actionTwo.getInterceptors();
-
-        assertNotNull(actionOne);
-        assertNotNull(actionTwo);
-        assertNotNull(actionOneInterceptors);
-        assertNotNull(actionTwoInterceptors);
-        assertEquals(actionOneInterceptors.size(), 3);
-        assertEquals(actionTwoInterceptors.size(), 3);
-
-        InterceptorMapping actionOneInterceptorMapping1 = actionOneInterceptors.get(0);
-        InterceptorMapping actionOneInterceptorMapping2 = actionOneInterceptors.get(1);
-        InterceptorMapping actionOneInterceptorMapping3 = actionOneInterceptors.get(2);
-        InterceptorMapping actionTwoInterceptorMapping1 = actionTwoInterceptors.get(0);
-        InterceptorMapping actionTwoInterceptorMapping2 = actionTwoInterceptors.get(1);
-        InterceptorMapping actionTwoInterceptorMapping3 = actionTwoInterceptors.get(2);
-
-        assertNotNull(actionOneInterceptorMapping1);
-        assertNotNull(actionOneInterceptorMapping2);
-        assertNotNull(actionOneInterceptorMapping3);
-        assertNotNull(actionTwoInterceptorMapping1);
-        assertNotNull(actionTwoInterceptorMapping2);
-        assertNotNull(actionTwoInterceptorMapping3);
-
-        assertEquals(((InterceptorForTestPurpose) actionOneInterceptorMapping1.getInterceptor()).getParamOne(), "i1p1");
-        assertEquals(((InterceptorForTestPurpose) actionOneInterceptorMapping1.getInterceptor()).getParamTwo(), "i1p2");
-        assertEquals(((InterceptorForTestPurpose) actionOneInterceptorMapping2.getInterceptor()).getParamOne(), "i2p1");
-        assertEquals(((InterceptorForTestPurpose) actionOneInterceptorMapping2.getInterceptor()).getParamTwo(), null);
-        assertEquals(((InterceptorForTestPurpose) actionOneInterceptorMapping3.getInterceptor()).getParamOne(), null);
-        assertEquals(((InterceptorForTestPurpose) actionOneInterceptorMapping3.getInterceptor()).getParamTwo(), null);
-
-        assertEquals(((InterceptorForTestPurpose) actionTwoInterceptorMapping1.getInterceptor()).getParamOne(), null);
-        assertEquals(((InterceptorForTestPurpose) actionTwoInterceptorMapping1.getInterceptor()).getParamTwo(), null);
-        assertEquals(((InterceptorForTestPurpose) actionTwoInterceptorMapping2.getInterceptor()).getParamOne(), null);
-        assertEquals(((InterceptorForTestPurpose) actionTwoInterceptorMapping2.getInterceptor()).getParamTwo(), "i2p2");
-        assertEquals(((InterceptorForTestPurpose) actionTwoInterceptorMapping3.getInterceptor()).getParamOne(), "i3p1");
-        assertEquals(((InterceptorForTestPurpose) actionTwoInterceptorMapping3.getInterceptor()).getParamTwo(), "i3p2");
-
-    }
-
-
-    @Override
-    protected void tearDown() throws Exception {
-
-        configurationManager.clearContainerProviders();
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java
deleted file mode 100644
index a028db4d0..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-import com.opensymphony.xwork2.util.fs.DefaultFileManager;
-import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <code>XmlConfigurationProviderInterceptorStackParamOverridingTest</code>
- *
- * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @version $Id$
- */
-public class XmlConfigurationProviderInterceptorStackParamOverridingTest extends XWorkTestCase {
-    
-    public void testInterceptorStackParamOveriding() throws Exception {
-    	DefaultConfiguration conf = new DefaultConfiguration();
-    	final XmlConfigurationProvider p = new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml");
-        DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
-        factory.setContainer(container);
-        factory.setFileManager(new DefaultFileManager());
-        p.setFileManagerFactory(factory);
-    	configurationManager.addContainerProvider(p);
-        conf.reload(new ArrayList<ConfigurationProvider>(){
-            {
-                add(new XWorkConfigurationProvider());
-                add(p);
-            }
-        });
-
-
-    	RuntimeConfiguration rtConf = conf.getRuntimeConfiguration();
-
-    	ActionConfig actionOne = rtConf.getActionConfig("", "actionOne");
-    	ActionConfig actionTwo = rtConf.getActionConfig("", "actionTwo");
-
-    	List actionOneInterceptors = actionOne.getInterceptors();
-    	List actionTwoInterceptors = actionTwo.getInterceptors();
-
-    	assertNotNull(actionOne);
-    	assertNotNull(actionTwo);
-    	assertNotNull(actionOneInterceptors);
-    	assertNotNull(actionTwoInterceptors);
-    	assertEquals(actionOneInterceptors.size(), 3);
-    	assertEquals(actionTwoInterceptors.size(), 3);
-
-    	InterceptorMapping actionOneInterceptorMapping1 = (InterceptorMapping) actionOneInterceptors.get(0);
-    	InterceptorMapping actionOneInterceptorMapping2 = (InterceptorMapping) actionOneInterceptors.get(1);
-    	InterceptorMapping actionOneInterceptorMapping3 = (InterceptorMapping) actionOneInterceptors.get(2);
-    	InterceptorMapping actionTwoInterceptorMapping1 = (InterceptorMapping) actionTwoInterceptors.get(0);
-    	InterceptorMapping actionTwoInterceptorMapping2 = (InterceptorMapping) actionTwoInterceptors.get(1);
-    	InterceptorMapping actionTwoInterceptorMapping3 = (InterceptorMapping) actionTwoInterceptors.get(2);
-
-    	assertNotNull(actionOneInterceptorMapping1);
-    	assertNotNull(actionOneInterceptorMapping2);
-    	assertNotNull(actionOneInterceptorMapping3);
-    	assertNotNull(actionTwoInterceptorMapping1);
-    	assertNotNull(actionTwoInterceptorMapping2);
-    	assertNotNull(actionTwoInterceptorMapping3);
-
-
-    	assertEquals(((InterceptorForTestPurpose)actionOneInterceptorMapping1.getInterceptor()).getParamOne(), "i1p1");
-		assertEquals(((InterceptorForTestPurpose)actionOneInterceptorMapping1.getInterceptor()).getParamTwo(), "i1p2");
-		assertEquals(((InterceptorForTestPurpose)actionOneInterceptorMapping2.getInterceptor()).getParamOne(), "i2p1");
-		assertEquals(((InterceptorForTestPurpose)actionOneInterceptorMapping2.getInterceptor()).getParamTwo(), null);
-		assertEquals(((InterceptorForTestPurpose)actionOneInterceptorMapping3.getInterceptor()).getParamOne(), null);
-		assertEquals(((InterceptorForTestPurpose)actionOneInterceptorMapping3.getInterceptor()).getParamTwo(), null);
-
-    	assertEquals(((InterceptorForTestPurpose)actionTwoInterceptorMapping1.getInterceptor()).getParamOne(), null);
-		assertEquals(((InterceptorForTestPurpose)actionTwoInterceptorMapping1.getInterceptor()).getParamTwo(), null);
-		assertEquals(((InterceptorForTestPurpose)actionTwoInterceptorMapping2.getInterceptor()).getParamOne(), null);
-		assertEquals(((InterceptorForTestPurpose)actionTwoInterceptorMapping2.getInterceptor()).getParamTwo(), "i2p2");
-		assertEquals(((InterceptorForTestPurpose)actionTwoInterceptorMapping3.getInterceptor()).getParamOne(), "i3p1");
-		assertEquals(((InterceptorForTestPurpose)actionTwoInterceptorMapping3.getInterceptor()).getParamTwo(), "i3p2");
-
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	configurationManager.clearContainerProviders();
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsSpringTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsSpringTest.java
deleted file mode 100644
index de1a5f73d..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsSpringTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.InterceptorConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.interceptor.TimerInterceptor;
-import org.springframework.beans.MutablePropertyValues;
-import org.springframework.context.support.StaticApplicationContext;
-
-import java.util.Map;
-
-
-/**
- * Created by IntelliJ IDEA.
- * User: Mike
- * Date: May 6, 2003
- * Time: 3:10:16 PM
- * To change this template use Options | File Templates.
- */
-public class XmlConfigurationProviderInterceptorsSpringTest extends ConfigurationTestBase {
-
-    InterceptorConfig timerInterceptor = new InterceptorConfig.Builder("timer", TimerInterceptor.class.getName()).build();
-    ObjectFactory objectFactory;
-    StaticApplicationContext sac;
-
-
-    public void testInterceptorsLoadedFromSpringApplicationContext() throws ConfigurationException {
-        sac.registerSingleton("timer-interceptor", TimerInterceptor.class, new MutablePropertyValues());
-
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml";
-
-        // Expect a ConfigurationException to be thrown if the interceptor reference
-        // cannot be resolved
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map interceptorConfigs = pkg.getInterceptorConfigs();
-
-        // assertions for size
-        assertEquals(1, interceptorConfigs.size());
-
-        // assertions for interceptors
-        InterceptorConfig seen = (InterceptorConfig) interceptorConfigs.get("timer");
-        assertEquals("timer-interceptor", seen.getClassName());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        sac = new StaticApplicationContext();
-
-        //SpringObjectFactory objFactory = new SpringObjectFactory();
-        //objFactory.setApplicationContext(sac);
-        //ObjectFactory.setObjectFactory(objFactory);
-
-        objectFactory = container.getInstance(ObjectFactory.class);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java
deleted file mode 100644
index 4f26b5f8f..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.interceptor.LoggingInterceptor;
-import com.opensymphony.xwork2.interceptor.TimerInterceptor;
-import com.opensymphony.xwork2.mock.MockInterceptor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Created by IntelliJ IDEA.
- * User: Mike
- * Date: May 6, 2003
- * Time: 3:10:16 PM
- * To change this template use Options | File Templates.
- */
-public class XmlConfigurationProviderInterceptorsTest extends ConfigurationTestBase {
-
-    InterceptorConfig loggingInterceptor = new InterceptorConfig.Builder("logging", LoggingInterceptor.class.getName()).build();
-    InterceptorConfig mockInterceptor = new InterceptorConfig.Builder("mock", MockInterceptor.class.getName()).build();
-    InterceptorConfig timerInterceptor = new InterceptorConfig.Builder("timer", TimerInterceptor.class.getName()).build();
-    ObjectFactory objectFactory;
-    
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        objectFactory = container.getInstance(ObjectFactory.class);
-    }
-
-
-    public void testBasicInterceptors() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // setup expectations
-        // the test interceptor with a parameter
-        Map<String, String> params = new HashMap<>();
-        params.put("foo", "expectedFoo");
-
-        InterceptorConfig paramsInterceptor = new InterceptorConfig.Builder("test", MockInterceptor.class.getName())
-            .addParams(params).build();
-
-        // the default interceptor stack
-        InterceptorStackConfig defaultStack = new InterceptorStackConfig.Builder("defaultStack")
-                .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-                .addInterceptor(new InterceptorMapping("test", objectFactory.buildInterceptor(mockInterceptor, params)))
-                .build();
-
-        // the derivative interceptor stack
-        InterceptorStackConfig derivativeStack = new InterceptorStackConfig.Builder("derivativeStack")
-                .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-            .addInterceptor(new InterceptorMapping("test", objectFactory.buildInterceptor(mockInterceptor, params)))
-                .addInterceptor(new InterceptorMapping("logging", objectFactory.buildInterceptor(loggingInterceptor, new HashMap<String, String>())))
-            .build();
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map interceptorConfigs = pkg.getInterceptorConfigs();
-
-        // assertions for size
-        assertEquals(5, interceptorConfigs.size());
-
-        // assertions for interceptors
-        assertEquals(timerInterceptor, interceptorConfigs.get("timer"));
-        assertEquals(loggingInterceptor, interceptorConfigs.get("logging"));
-        assertEquals(paramsInterceptor, interceptorConfigs.get("test"));
-
-        // assertions for interceptor stacks
-        assertEquals(defaultStack, interceptorConfigs.get("defaultStack"));
-        assertEquals(derivativeStack, interceptorConfigs.get("derivativeStack"));
-    }
-
-    public void testInterceptorDefaultRefs() throws ConfigurationException {
-        XmlConfigurationProvider provider = new XmlConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml");
-        container.inject(provider);
-        loadConfigurationProviders(provider);
-
-        // expectations - the inherited interceptor stack
-        // default package
-        ArrayList<InterceptorMapping> interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("logging", objectFactory.buildInterceptor(loggingInterceptor, new HashMap<String, String>())));
-
-        ActionConfig actionWithOwnRef = new ActionConfig.Builder("", "ActionWithOwnRef", SimpleAction.class.getName())
-            .addInterceptors(interceptors)
-            .build();
-
-        ActionConfig actionWithDefaultRef = new ActionConfig.Builder("", "ActionWithDefaultRef", SimpleAction.class.getName())
-            .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-            .build();
-
-        // sub package
-        // this should inherit
-        ActionConfig actionWithNoRef = new ActionConfig.Builder("", "ActionWithNoRef", SimpleAction.class.getName())
-            .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-            .build();
-
-        interceptors = new ArrayList<>();
-        interceptors.add(new InterceptorMapping("logging", objectFactory.buildInterceptor(loggingInterceptor, new HashMap<String, String>())));
-
-        ActionConfig anotherActionWithOwnRef = new ActionConfig.Builder("", "AnotherActionWithOwnRef", SimpleAction.class.getName())
-            .addInterceptor(new InterceptorMapping("logging", objectFactory.buildInterceptor(loggingInterceptor, new HashMap<String, String>())))
-            .build();
-
-        RuntimeConfiguration runtimeConfig = configurationManager.getConfiguration().getRuntimeConfiguration();
-
-        // assertions
-        assertEquals(actionWithOwnRef, runtimeConfig.getActionConfig("", "ActionWithOwnRef"));
-        assertEquals(actionWithDefaultRef, runtimeConfig.getActionConfig("", "ActionWithDefaultRef"));
-
-        assertEquals(actionWithNoRef, runtimeConfig.getActionConfig("", "ActionWithNoRef"));
-        assertEquals(anotherActionWithOwnRef, runtimeConfig.getActionConfig("", "AnotherActionWithOwnRef"));
-    }
-
-    public void testInterceptorInheritance() throws ConfigurationException {
-        
-        // expectations - the inherited interceptor stack
-        InterceptorStackConfig inheritedStack = new InterceptorStackConfig.Builder("subDefaultStack")
-            .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-            .build();
-
-        ConfigurationProvider provider = buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml");
-
-        // assertions
-        PackageConfig defaultPkg = configuration.getPackageConfig("default");
-        assertEquals(2, defaultPkg.getInterceptorConfigs().size());
-
-        PackageConfig subPkg = configuration.getPackageConfig("subPackage");
-        assertEquals(1, subPkg.getInterceptorConfigs().size());
-        assertEquals(3, subPkg.getAllInterceptorConfigs().size());
-        assertEquals(inheritedStack, subPkg.getInterceptorConfigs().get("subDefaultStack"));
-
-        // expectations - the inherited interceptor stack
-        inheritedStack = new InterceptorStackConfig.Builder("subSubDefaultStack")
-                .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-                .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-                .build();
-
-        PackageConfig subSubPkg = configuration.getPackageConfig("subSubPackage");
-        assertEquals(1, subSubPkg.getInterceptorConfigs().size());
-        assertEquals(4, subSubPkg.getAllInterceptorConfigs().size());
-        assertEquals(inheritedStack, subSubPkg.getInterceptorConfigs().get("subSubDefaultStack"));
-    }
-
-
-    public void testInterceptorParamOverriding() throws Exception {
-
-        Map<String, String> params = new HashMap<>();
-        params.put("foo", "expectedFoo");
-        params.put("expectedFoo", "expectedFooValue");
-
-        InterceptorStackConfig defaultStack = new InterceptorStackConfig.Builder("defaultStack")
-            .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-            .addInterceptor(new InterceptorMapping("test", objectFactory.buildInterceptor(mockInterceptor, params)))
-            .build();
-
-        ArrayList<InterceptorMapping> interceptors = new ArrayList<>();
-        interceptors.addAll(defaultStack.getInterceptors());
-
-        ActionConfig intAction = new ActionConfig.Builder("", "TestInterceptorParam", SimpleAction.class.getName())
-            .addInterceptors(interceptors)
-            .build();
-
-        // TestInterceptorParamOverride action tests that an interceptor with a param override worked
-        HashMap<String, String> interceptorParams = new HashMap<>();
-        interceptorParams.put("expectedFoo", "expectedFooValue2");
-        interceptorParams.put("foo", "foo123");
-
-        InterceptorStackConfig defaultStack2 = new InterceptorStackConfig.Builder("defaultStack")
-            .addInterceptor(new InterceptorMapping("timer", objectFactory.buildInterceptor(timerInterceptor, new HashMap<String, String>())))
-            .addInterceptor(new InterceptorMapping("test", objectFactory.buildInterceptor(mockInterceptor, interceptorParams)))
-            .build();
-
-        interceptors = new ArrayList<>();
-
-        interceptors.addAll(defaultStack2.getInterceptors());
-
-        ActionConfig intOverAction = new ActionConfig.Builder("", "TestInterceptorParamOverride", SimpleAction.class.getName())
-            .addInterceptors(interceptors)
-            .build();
-
-        ConfigurationProvider provider = buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml");
-
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(2, actionConfigs.size());
-        assertEquals(intAction, actionConfigs.get("TestInterceptorParam"));
-        assertEquals(intOverAction, actionConfigs.get("TestInterceptorParamOverride"));
-
-        ActionConfig ac = (ActionConfig) actionConfigs.get("TestInterceptorParamOverride");
-        assertEquals(defaultStack.getInterceptors(), ac.getInterceptors());
-
-        ActionConfig ac2 = (ActionConfig) actionConfigs.get("TestInterceptorParam");
-        assertEquals(defaultStack2.getInterceptors(), ac2.getInterceptors());
-
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java
deleted file mode 100644
index 889b2fd82..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-
-
-/**
- * XmlConfigurationProviderInvalidFileTest
- *
- * @author Jason Carreira
- *         Created Sep 6, 2003 2:36:10 PM
- */
-public class XmlConfigurationProviderInvalidFileTest extends ConfigurationTestBase {
-
-    public void testInvalidFileThrowsException() {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml";
-
-        try {
-            ConfigurationProvider provider = buildConfigurationProvider(filename);
-            fail();
-        } catch (ConfigurationException e) {
-            // this is what we expect
-        }
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
deleted file mode 100644
index dcf6b69fa..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import junit.framework.Assert;
-
-
-/**
- * Verify that Interceptor inheritance is happy for multi-level package derivations
- *
- * @author $Author$
- * @version $Revision$
- */
-public class XmlConfigurationProviderMultilevelTest extends ConfigurationTestBase {
-
-    /**
-     * attempt to load an xwork.xml file that has multilevel levels of inheritance and verify that the interceptors are
-     * correctly propagated through.
-     *
-     * @throws Exception
-     */
-    public void testMultiLevelInheritance() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        provider.init(configuration);
-        provider.loadPackages();
-
-        /**
-         * for this test, we expect the action named, action3, in the namespace, namespace3, to have a single
-         * ParameterInterceptor.  The ParameterInterceptor, param, has been defined far up namespace3's parentage ...
-         * namespace3 -> namespace2 -> namespace1 -> default
-         */
-        PackageConfig packageConfig = configuration.getPackageConfig("namespace3");
-        Assert.assertNotNull(packageConfig);
-        assertEquals(2, packageConfig.getAllInterceptorConfigs().size());
-
-        ActionConfig actionConfig = packageConfig.getActionConfigs().get("action3");
-
-        assertNotNull(actionConfig);
-        assertNotNull(actionConfig.getInterceptors());
-        assertEquals(2, actionConfig.getInterceptors().size());
-        assertEquals(ParametersInterceptor.class, ((InterceptorMapping) actionConfig.getInterceptors().get(0)).getInterceptor().getClass());
-        assertNotNull(actionConfig.getResults());
-        assertEquals(1, actionConfig.getResults().size());
-        assertTrue(actionConfig.getResults().containsKey("success"));
-
-        ResultConfig resultConfig = (ResultConfig) actionConfig.getResults().get("success");
-        assertEquals(ActionChainResult.class.getName(), resultConfig.getClassName());
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
deleted file mode 100644
index 01bcc7e40..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-
-import java.util.List;
-
-
-/**
- * Created by IntelliJ IDEA.
- * User: Mike
- * Date: May 6, 2003
- * Time: 3:10:16 PM
- * To change this template use Options | File Templates.
- */
-public class XmlConfigurationProviderPackagesTest extends ConfigurationTestBase {
-
-    public void testBadInheritance() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml";
-        ConfigurationProvider provider = null;
-        try {
-	    	provider = buildConfigurationProvider(filename);
-	    	fail("Should have thrown a ConfigurationException");
-	        provider.init(configuration);
-	        provider.loadPackages();
-        } catch (ConfigurationException e) {
-        	// Expected
-        }
-    }
-
-    public void testBasicPackages() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        provider.init(configuration);
-        provider.loadPackages();
-
-        // setup our expectations
-        PackageConfig expectedNamespacePackage = new PackageConfig.Builder("namespacepkg")
-            .namespace("/namespace/set")
-            .isAbstract(false)
-            .build();
-        PackageConfig expectedAbstractPackage = new PackageConfig.Builder("abstractpkg")
-            .isAbstract(true)
-            .build();
-
-        // test expectations
-        assertEquals(3, configuration.getPackageConfigs().size());
-        assertEquals(expectedNamespacePackage, configuration.getPackageConfig("namespacepkg"));
-        assertEquals(expectedAbstractPackage, configuration.getPackageConfig("abstractpkg"));
-    }
-
-    public void testDefaultPackage() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        provider.init(configuration);
-        provider.loadPackages();
-
-        // setup our expectations
-        PackageConfig expectedPackageConfig = new PackageConfig.Builder("default").build();
-
-        // test expectations
-        assertEquals(1, configuration.getPackageConfigs().size());
-        assertEquals(expectedPackageConfig, configuration.getPackageConfig("default"));
-    }
-
-    public void testPackageInheritance() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        provider.init(configuration);
-        provider.loadPackages();
-
-        // test expectations
-        assertEquals(5, configuration.getPackageConfigs().size());
-        PackageConfig defaultPackage = configuration.getPackageConfig("default");
-        assertNotNull(defaultPackage);
-        assertEquals("default", defaultPackage.getName());
-        PackageConfig abstractPackage = configuration.getPackageConfig("abstractPackage");
-        assertNotNull(abstractPackage);
-        assertEquals("abstractPackage", abstractPackage.getName());
-        PackageConfig singlePackage = configuration.getPackageConfig("singleInheritance");
-        assertNotNull(singlePackage);
-        assertEquals("singleInheritance", singlePackage.getName());
-        assertEquals(1, singlePackage.getParents().size());
-        assertEquals(defaultPackage, singlePackage.getParents().get(0));
-        PackageConfig multiplePackage = configuration.getPackageConfig("multipleInheritance");
-        assertNotNull(multiplePackage);
-        assertEquals("multipleInheritance", multiplePackage.getName());
-        assertEquals(3, multiplePackage.getParents().size());
-        List<PackageConfig> multipleParents = multiplePackage.getParents();
-        assertTrue(multipleParents.contains(defaultPackage));
-        assertTrue(multipleParents.contains(abstractPackage));
-        assertTrue(multipleParents.contains(singlePackage));
-        
-        PackageConfig parentBelow = configuration.getPackageConfig("testParentBelow");
-        assertEquals(1, parentBelow.getParents().size());
-        List<PackageConfig> parentBelowParents = parentBelow.getParents();
-        assertTrue(parentBelowParents.contains(multiplePackage));
-
-        configurationManager.addContainerProvider(provider);
-        configurationManager.reload();
-
-        RuntimeConfiguration runtimeConfiguration = configurationManager.getConfiguration().getRuntimeConfiguration();
-        assertNotNull(runtimeConfiguration.getActionConfig("/multiple", "default"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/multiple", "abstract"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/multiple", "single"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/multiple", "multiple"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/single", "default"));
-        assertNull(runtimeConfiguration.getActionConfig("/single", "abstract"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/single", "single"));
-        assertNull(runtimeConfiguration.getActionConfig("/single", "multiple"));
-        
-        assertNotNull(runtimeConfiguration.getActionConfig("/parentBelow", "default"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/parentBelow", "abstract"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/parentBelow", "single"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/parentBelow", "multiple"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/parentBelow", "testParentBelowAction"));
-
-    }
-
-    public void testDefaultClassRef() throws ConfigurationException {
-    	final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml";
-        final String hasDefaultClassRefPkgName = "hasDefaultClassRef";
-        final String noDefaultClassRefPkgName = "noDefaultClassRef";
-        final String testDefaultClassRef = "com.opensymphony.xwork2.ActionSupport";
-
-    	ConfigurationProvider provider = buildConfigurationProvider(filename);
-        provider.init(configuration);
-
-        // setup our expectations
-        PackageConfig expectedDefaultClassRefPackage = new PackageConfig.Builder(hasDefaultClassRefPkgName).defaultClassRef(testDefaultClassRef).build();
-
-        PackageConfig expectedNoDefaultClassRefPackage = new PackageConfig.Builder(noDefaultClassRefPkgName).build();
-
-        // test expectations
-        assertEquals(2, configuration.getPackageConfigs().size());
-        assertEquals(expectedDefaultClassRefPackage, configuration.getPackageConfig(hasDefaultClassRefPkgName));
-        assertEquals(expectedNoDefaultClassRefPackage, configuration.getPackageConfig(noDefaultClassRefPkgName));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java
deleted file mode 100644
index f5ef9356f..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
-import com.opensymphony.xwork2.mock.MockResult;
-
-import java.util.Map;
-
-
-/**
- * Test XmlConfigurationProvider's <result-types> ... </result-types>
- * 
- * @author tm_jee
- * @version $Date$ $Id$
- */
-public class XmlConfigurationProviderResultTypesTest extends ConfigurationTestBase {
-
-	public void testPlainResultTypesParams() throws Exception {
-		ConfigurationProvider configurationProvider = buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml");
-		
-		PackageConfig packageConfig = configuration.getPackageConfig("xworkResultTypesTestPackage1");
-		Map resultTypesConfigMap = packageConfig.getResultTypeConfigs();
-		
-		assertEquals(resultTypesConfigMap.size(), 2);
-		assertTrue(resultTypesConfigMap.containsKey("result1"));
-		assertTrue(resultTypesConfigMap.containsKey("result2"));
-		assertFalse(resultTypesConfigMap.containsKey("result3"));
-		
-		ResultTypeConfig result1ResultTypeConfig = (ResultTypeConfig) resultTypesConfigMap.get("result1");
-		Map result1ParamsMap = result1ResultTypeConfig.getParams();
-		ResultTypeConfig result2ResultTypeConfig = (ResultTypeConfig) resultTypesConfigMap.get("result2");
-		Map result2ParamsMap = result2ResultTypeConfig.getParams();
-		
-		assertEquals(result1ResultTypeConfig.getName(), "result1");
-		assertEquals(result1ResultTypeConfig.getClazz(), MockResult.class.getName());
-		assertEquals(result2ResultTypeConfig.getName(), "result2");
-		assertEquals(result2ResultTypeConfig.getClazz(), MockResult.class.getName());
-		assertEquals(result1ParamsMap.size(), 3);
-		assertEquals(result2ParamsMap.size(), 2);
-		assertTrue(result1ParamsMap.containsKey("param1"));
-		assertTrue(result1ParamsMap.containsKey("param2"));
-		assertTrue(result1ParamsMap.containsKey("param3"));
-		assertFalse(result1ParamsMap.containsKey("param4"));
-		assertTrue(result2ParamsMap.containsKey("paramA"));
-		assertTrue(result2ParamsMap.containsKey("paramB"));
-		assertFalse(result2ParamsMap.containsKey("paramC"));
-		assertEquals(result1ParamsMap.get("param1"), "value1");
-		assertEquals(result1ParamsMap.get("param2"), "value2");
-		assertEquals(result1ParamsMap.get("param3"), "value3");
-		assertEquals(result2ParamsMap.get("paramA"), "valueA");
-		assertEquals(result2ParamsMap.get("paramB"), "valueB");
-	}
-	
-	public void testInheritedResultTypesParams() throws Exception {
-		ConfigurationProvider configurationProvider = buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml");
-		
-		PackageConfig packageConfig = configuration.getPackageConfig("xworkResultTypesTestPackage2");
-		Map actionConfigMap = packageConfig.getActionConfigs();
-		
-		
-		ActionConfig action1ActionConfig = (ActionConfig) actionConfigMap.get("action1");
-		ActionConfig action2ActionConfig = (ActionConfig) actionConfigMap.get("action2");
-		
-		ResultConfig action1Result = (ResultConfig) action1ActionConfig.getResults().get("success");
-		ResultConfig action2Result = (ResultConfig) action2ActionConfig.getResults().get("success");
-		
-		assertEquals(action1Result.getName(), "success");
-		assertEquals(action1Result.getClassName(), "com.opensymphony.xwork2.mock.MockResult");
-		assertEquals(action1Result.getName(), "success");
-		assertEquals(action1Result.getClassName(), "com.opensymphony.xwork2.mock.MockResult");
-		
-		Map action1ResultMap = action1Result.getParams();
-		Map action2ResultMap = action2Result.getParams();
-		
-		assertEquals(action1ResultMap.size(), 5);
-		assertTrue(action1ResultMap.containsKey("param1"));
-		assertTrue(action1ResultMap.containsKey("param2"));
-		assertTrue(action1ResultMap.containsKey("param3"));
-		assertTrue(action1ResultMap.containsKey("param10"));
-		assertTrue(action1ResultMap.containsKey("param11"));
-		assertFalse(action1ResultMap.containsKey("param12"));
-		assertEquals(action1ResultMap.get("param1"), "newValue1");
-		assertEquals(action1ResultMap.get("param2"), "value2");
-		assertEquals(action1ResultMap.get("param3"), "newValue3");
-		assertEquals(action1ResultMap.get("param10"), "value10");
-		assertEquals(action1ResultMap.get("param11"), "value11");
-		
-		assertEquals(action2ResultMap.size(), 3);
-		assertTrue(action2ResultMap.containsKey("paramA"));
-		assertTrue(action2ResultMap.containsKey("paramB"));
-		assertTrue(action2ResultMap.containsKey("paramZ"));
-		assertFalse(action2ResultMap.containsKey("paramY"));
-		assertEquals(action2ResultMap.get("paramA"), "valueA");
-		assertEquals(action2ResultMap.get("paramB"), "newValueB");
-		assertEquals(action2ResultMap.get("paramZ"), "valueZ");
-		
-		
-	}
-}
-
-
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java
deleted file mode 100644
index caa9da0d6..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
-import com.opensymphony.xwork2.mock.MockResult;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Created by IntelliJ IDEA.
- * User: Mike
- * Date: May 6, 2003
- * Time: 3:10:16 PM
- * To change this template use Options | File Templates.
- */
-public class XmlConfigurationProviderResultsTest extends ConfigurationTestBase {
-
-    public void testActions() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-results.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        HashMap<String, String> parameters = new HashMap<>();
-        HashMap<String, ResultConfig> results = new HashMap<>();
-
-        results.put("chainDefaultTypedResult", new ResultConfig.Builder("chainDefaultTypedResult", ActionChainResult.class.getName()).build());
-
-        results.put("mockTypedResult", new ResultConfig.Builder("mockTypedResult", MockResult.class.getName()).build());
-
-        Map<String, String> resultParams = new HashMap<>();
-        resultParams.put("actionName", "bar.vm");
-        results.put("specificLocationResult", new ResultConfig.Builder("specificLocationResult", ActionChainResult.class.getName())
-                .addParams(resultParams).build());
-
-        resultParams = new HashMap<>();
-        resultParams.put("actionName", "foo.vm");
-        results.put("defaultLocationResult", new ResultConfig.Builder("defaultLocationResult", ActionChainResult.class.getName())
-                .addParams(resultParams).build());
-
-        resultParams = new HashMap<>();
-        resultParams.put("foo", "bar");
-        results.put("noDefaultLocationResult", new ResultConfig.Builder("noDefaultLocationResult", ActionChainResult.class.getName())
-                .addParams(resultParams).build());
-
-        ActionConfig expectedAction = new ActionConfig.Builder("default", "Bar", SimpleAction.class.getName())
-            .addParams(parameters)
-            .addResultConfigs(results)
-            .build();
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map<String, ActionConfig> actionConfigs = pkg.getActionConfigs();
-
-        // assertions
-        assertEquals(1, actionConfigs.size());
-
-        ActionConfig action = actionConfigs.get("Bar");
-        assertEquals(expectedAction, action);
-    }
-
-    public void testResultInheritance() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // expectations
-        provider.init(configuration);
-        provider.loadPackages();
-
-        // assertions
-        PackageConfig subPkg = configuration.getPackageConfig("subPackage");
-        assertEquals(1, subPkg.getResultTypeConfigs().size());
-        assertEquals(3, subPkg.getAllResultTypeConfigs().size());
-    }
-
-    public void testResultTypes() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-results.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        // setup expectations
-        ResultTypeConfig chainResult = new ResultTypeConfig.Builder("chain", ActionChainResult.class.getName()).build();
-        ResultTypeConfig mockResult = new ResultTypeConfig.Builder("mock", MockResult.class.getName()).build();
-
-        // execute the configuration
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig pkg = configuration.getPackageConfig("default");
-        Map resultTypes = pkg.getResultTypeConfigs();
-
-        // assertions
-        assertEquals(2, resultTypes.size());
-        assertEquals("chain", pkg.getDefaultResultType());
-        assertEquals(chainResult, resultTypes.get("chain"));
-        assertEquals(mockResult, resultTypes.get("mock"));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
deleted file mode 100644
index b161d02ab..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.FileManagerFactory;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.impl.MockConfiguration;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import org.w3c.dom.Document;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-public class XmlConfigurationProviderTest extends ConfigurationTestBase {
-
-    public void testLoadOrder() throws Exception {
-        configuration = new MockConfiguration();
-        ((MockConfiguration) configuration).selfRegister();
-        container = configuration.getContainer();
-
-        XmlConfigurationProvider prov = new XmlConfigurationProvider("xwork-test-load-order.xml", true) {
-            @Override
-            protected Iterator<URL> getConfigurationUrls(String fileName) throws IOException {
-                List<URL> urls = new ArrayList<>();
-                urls.add(ClassLoaderUtil.getResource("com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml", XmlConfigurationProvider.class));
-                urls.add(ClassLoaderUtil.getResource("com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml", XmlConfigurationProvider.class));
-                urls.add(ClassLoaderUtil.getResource("com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml", XmlConfigurationProvider.class));
-                return urls.iterator();
-            }
-        };
-        prov.setObjectFactory(container.getInstance(ObjectFactory.class));
-        prov.setFileManagerFactory(container.getInstance(FileManagerFactory.class));
-        prov.init(configuration);
-        List<Document> docs = prov.getDocuments();
-        assertEquals(3, docs.size());
-
-        assertEquals(1, XmlHelper.getLoadOrder(docs.get(0)).intValue());
-        assertEquals(2, XmlHelper.getLoadOrder(docs.get(1)).intValue());
-        assertEquals(3, XmlHelper.getLoadOrder(docs.get(2)).intValue());
-    }
-
-    public static final long FILE_TS_WAIT_IN_MS = 3600000;
-
-    private static void changeFileTime(File f) throws Exception {
-        final long orig = f.lastModified();
-        final long maxwait = orig + FILE_TS_WAIT_IN_MS;
-        long curr;
-        while (!f.setLastModified(curr = System.currentTimeMillis()) || orig == f.lastModified()) {
-            Thread.sleep(500);
-            assertTrue("Waited more than " + FILE_TS_WAIT_IN_MS + " ms to update timestamp on file: " + f, maxwait > curr);
-        }
-    }
-
-    public void testNeedsReload() throws Exception {
-        container.getInstance(FileManagerFactory.class).setReloadingConfigs("true");
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        container.getInstance(FileManagerFactory.class).setReloadingConfigs("true");
-
-        assertTrue(!provider.needsReload()); // Revision exists and timestamp didn't change
-
-        File file = new File(getClass().getResource("/" + filename).toURI());
-        assertTrue("not exists: " + file.toString(), file.exists());
-        changeFileTime(file);
-
-        assertTrue(provider.needsReload());
-    }
-
-    public void testInheritence() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-include-parent.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        provider.init(configuration);
-        provider.loadPackages();
-
-        // test expectations
-        assertEquals(6, configuration.getPackageConfigs().size());
-
-
-        PackageConfig defaultPackage = configuration.getPackageConfig("default");
-        assertNotNull(defaultPackage);
-        assertEquals("default", defaultPackage.getName());
-
-
-        PackageConfig namespace1 = configuration.getPackageConfig("namespace1");
-        assertNotNull(namespace1);
-        assertEquals("namespace1", namespace1.getName());
-        assertEquals(defaultPackage, namespace1.getParents().get(0));
-
-        PackageConfig namespace2 = configuration.getPackageConfig("namespace2");
-        assertNotNull(namespace2);
-        assertEquals("namespace2", namespace2.getName());
-        assertEquals(1, namespace2.getParents().size());
-        assertEquals(namespace1, namespace2.getParents().get(0));
-
-
-        PackageConfig namespace4 = configuration.getPackageConfig("namespace4");
-        assertNotNull(namespace4);
-        assertEquals("namespace4", namespace4.getName());
-        assertEquals(1, namespace4.getParents().size());
-        assertEquals(namespace1, namespace4.getParents().get(0));
-
-
-        PackageConfig namespace5 = configuration.getPackageConfig("namespace5");
-        assertNotNull(namespace5);
-        assertEquals("namespace5", namespace5.getName());
-        assertEquals(1, namespace5.getParents().size());
-        assertEquals(namespace4, namespace5.getParents().get(0));
-
-        configurationManager.addContainerProvider(provider);
-        configurationManager.reload();
-
-        RuntimeConfiguration runtimeConfiguration = configurationManager.getConfiguration().getRuntimeConfiguration();
-        assertNotNull(runtimeConfiguration.getActionConfig("/namespace1", "action1"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/namespace2", "action2"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/namespace4", "action4"));
-        assertNotNull(runtimeConfiguration.getActionConfig("/namespace5", "action5"));
-    }
-
-    public void testGuessResultType() {
-        XmlConfigurationProvider prov = new XmlConfigurationProvider();
-
-        assertEquals(null, prov.guessResultType(null));
-        assertEquals("foo", prov.guessResultType("foo"));
-        assertEquals("foo", prov.guessResultType("foo-"));
-        assertEquals("fooBar", prov.guessResultType("foo-bar"));
-        assertEquals("fooBarBaz", prov.guessResultType("foo-bar-baz"));
-    }
-
-    public void testEmptySpaces() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork- test.xml";
-        container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
-
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        assertTrue(!provider.needsReload());
-
-        URI uri = ClassLoaderUtil.getResource(filename, ConfigurationProvider.class).toURI();
-
-        File file = new File(uri);
-
-        assertTrue(file.exists());
-        changeFileTime(file);
-
-        assertTrue(provider.needsReload());
-    }
-
-    public void testConfigsInJarFiles() throws Exception {
-        container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
-        testProvider("xwork-jar.xml");
-        testProvider("xwork-zip.xml");
-        testProvider("xwork - jar.xml");
-        testProvider("xwork - zip.xml");
-
-        testProvider("xwork-jar2.xml");
-        testProvider("xwork-zip2.xml");
-        testProvider("xwork - jar2.xml");
-        testProvider("xwork - zip2.xml");
-    }
-
-    private void testProvider(String configFile) throws Exception {
-        ConfigurationProvider provider = buildConfigurationProvider(configFile);
-        assertTrue(!provider.needsReload());
-
-        String fullPath = ClassLoaderUtil.getResource(configFile, ConfigurationProvider.class).toString();
-
-        int startIndex = fullPath.indexOf(":file:/");
-        int endIndex = fullPath.indexOf("!/");
-
-        String jar = fullPath.substring(startIndex + (":file:/".length() - 1), endIndex).replaceAll("%20", " ");
-
-        File file = new File(jar);
-
-        assertTrue("File [" + file + "] doesn't exist!", file.exists());
-        file.setLastModified(System.currentTimeMillis());
-
-        assertTrue(!provider.needsReload());
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java
deleted file mode 100644
index ba1758888..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.UnknownHandlerManager;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig;
-import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
-
-import java.util.List;
-
-public class XmlConfigurationProviderUnknownHandlerStackTest extends ConfigurationTestBase {
-
-    public void testStackWithElements() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        loadConfigurationProviders(provider);
-        configurationManager.reload();
-
-        List<UnknownHandlerConfig> unknownHandlerStack = configuration.getUnknownHandlerStack();
-        assertNotNull(unknownHandlerStack);
-        assertEquals(2, unknownHandlerStack.size());
-
-        assertEquals("uh1", unknownHandlerStack.get(0).getName());
-        assertEquals("uh2", unknownHandlerStack.get(1).getName());
-
-        UnknownHandlerManager unknownHandlerManager = new DefaultUnknownHandlerManager();
-        container.inject(unknownHandlerManager);
-        assertTrue(unknownHandlerManager.hasUnknownHandlers());
-    }
-
-    public void testEmptyStack() throws ConfigurationException {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-        loadConfigurationProviders(provider);
-        configurationManager.reload();
-
-        List<UnknownHandlerConfig> unknownHandlerStack = configuration.getUnknownHandlerStack();
-        assertNull(unknownHandlerStack);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
deleted file mode 100644
index 71cfc2585..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-
-public class XmlConfigurationProviderWildCardIncludeTest extends ConfigurationTestBase {
-
-    
-    public void testWildCardInclude() throws Exception {
-        final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml";
-        ConfigurationProvider provider = buildConfigurationProvider(filename);
-
-        provider.init(configuration);
-        provider.loadPackages();
-
-        PackageConfig defaultWildcardPackage = configuration.getPackageConfig("default-wildcard");
-        assertNotNull(defaultWildcardPackage);
-        assertEquals("default-wildcard", defaultWildcardPackage.getName());
-
-
-        PackageConfig defaultOnePackage = configuration.getPackageConfig("default-1");
-        assertNotNull(defaultOnePackage);
-        assertEquals("default-1", defaultOnePackage.getName());
-        
-        PackageConfig defaultTwoPackage = configuration.getPackageConfig("default-2");
-        assertNotNull(defaultTwoPackage);
-        assertEquals("default-2", defaultTwoPackage.getName());       
-
-        configurationManager.addContainerProvider(provider);
-        configurationManager.reload();
-
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
deleted file mode 100644
index 9e0f1a39e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.opensymphony.xwork2.config.providers;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import org.easymock.MockControl;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.Map;
-
-/**
- * <code>XmlHelperTest</code>
- *
- * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @version $Id$
- */
-public class XmlHelperTest extends XWorkTestCase {
-
-    public void testGetContent1() throws Exception {
-        // set up Node
-        MockControl nodeControl = MockControl.createControl(Node.class);
-        Node mockNode = (Node) nodeControl.getMock();
-
-        nodeControl.expectAndDefaultReturn(mockNode.getNodeValue(), "testing testing 123");
-        nodeControl.expectAndDefaultReturn(mockNode.getNodeType(), Node.TEXT_NODE);
-
-
-        // set up NodeList
-        MockControl nodeListControl = MockControl.createControl(NodeList.class);
-        NodeList mockNodeList = (NodeList) nodeListControl.getMock();
-
-        nodeListControl.expectAndDefaultReturn(mockNodeList.getLength(), 1);
-        nodeListControl.expectAndDefaultReturn(mockNodeList.item(0), mockNode);
-
-
-        // set up Element
-        MockControl elementControl = MockControl.createControl(Element.class);
-        Element mockElement = (Element) elementControl.getMock();
-
-        elementControl.expectAndDefaultReturn(mockElement.getChildNodes(), mockNodeList);
-
-        nodeControl.replay();
-        nodeListControl.replay();
-        elementControl.replay();
-
-        String result = XmlHelper.getContent(mockElement);
-
-        nodeControl.verify();
-        nodeListControl.verify();
-        elementControl.verify();
-
-        assertEquals(result, "testing testing 123");
-    }
-
-
-    public void testGetContent2() throws Exception {
-        // set up Node
-        MockControl nodeControl1 = MockControl.createControl(Node.class);
-        Node mockNode1 = (Node) nodeControl1.getMock();
-
-        nodeControl1.expectAndDefaultReturn(mockNode1.getNodeValue(), "testing testing 123");
-        nodeControl1.expectAndDefaultReturn(mockNode1.getNodeType(), Node.TEXT_NODE);
-
-        MockControl nodeControl2 = MockControl.createControl(Node.class);
-        Node mockNode2 = (Node) nodeControl2.getMock();
-
-        nodeControl2.expectAndDefaultReturn(mockNode2.getNodeValue(), "comment 1");
-        nodeControl2.expectAndDefaultReturn(mockNode2.getNodeType(), Node.COMMENT_NODE);
-
-        MockControl nodeControl3 = MockControl.createControl(Node.class);
-        Node mockNode3 = (Node) nodeControl3.getMock();
-
-        nodeControl3.expectAndDefaultReturn(mockNode3.getNodeValue(), " tmjee ");
-        nodeControl3.expectAndDefaultReturn(mockNode3.getNodeType(), Node.TEXT_NODE);
-
-        MockControl nodeControl4 = MockControl.createControl(Node.class);
-        Node mockNode4 = (Node) nodeControl4.getMock();
-
-        nodeControl4.expectAndDefaultReturn(mockNode4.getNodeValue(), " phil ");
-        nodeControl4.expectAndDefaultReturn(mockNode4.getNodeType(), Node.TEXT_NODE);
-
-        MockControl nodeControl5 = MockControl.createControl(Node.class);
-        Node mockNode5 = (Node) nodeControl5.getMock();
-
-        nodeControl5.expectAndDefaultReturn(mockNode5.getNodeValue(), "comment 2");
-        nodeControl5.expectAndDefaultReturn(mockNode5.getNodeType(), Node.COMMENT_NODE);
-
-        MockControl nodeControl6 = MockControl.createControl(Node.class);
-        Node mockNode6 = (Node) nodeControl6.getMock();
-
-        nodeControl6.expectAndDefaultReturn(mockNode6.getNodeValue(), "comment 3");
-        nodeControl6.expectAndDefaultReturn(mockNode6.getNodeType(), Node.COMMENT_NODE);
-
-
-        // set up NodeList
-        MockControl nodeListControl = MockControl.createControl(NodeList.class);
-        NodeList mockNodeList = (NodeList) nodeListControl.getMock();
-
-        nodeListControl.expectAndDefaultReturn(mockNodeList.getLength(), 6);
-        mockNodeList.item(0);
-        nodeListControl.setReturnValue(mockNode1);
-        mockNodeList.item(1);
-        nodeListControl.setReturnValue(mockNode2);
-        mockNodeList.item(2);
-        nodeListControl.setDefaultReturnValue(mockNode3);
-        mockNodeList.item(3);
-        nodeListControl.setReturnValue(mockNode4);
-        mockNodeList.item(4);
-        nodeListControl.setReturnValue(mockNode5);
-        mockNodeList.item(5);
-        nodeListControl.setReturnValue(mockNode6);
-
-
-        // set up Element
-        MockControl elementControl = MockControl.createControl(Element.class);
-        Element mockElement = (Element) elementControl.getMock();
-
-        elementControl.expectAndDefaultReturn(mockElement.getChildNodes(), mockNodeList);
-
-        nodeControl1.replay();
-        nodeControl2.replay();
-        nodeControl3.replay();
-        nodeControl4.replay();
-        nodeControl5.replay();
-        nodeControl6.replay();
-        nodeListControl.replay();
-        elementControl.replay();
-
-        String result = XmlHelper.getContent(mockElement);
-
-        nodeControl1.verify();
-        nodeControl2.verify();
-        nodeControl3.verify();
-        nodeControl4.verify();
-        nodeControl5.verify();
-        nodeControl6.verify();
-        nodeListControl.verify();
-        elementControl.verify();
-
-        assertEquals(result, "testing testing 123tmjeephil");
-    }
-
-
-
-    public void testGetParams() throws Exception {
-        // <param name="param1">value1</param>
-            MockControl nodeControl1 = MockControl.createControl(Node.class);
-            Node mockNode1 = (Node) nodeControl1.getMock();
-
-            nodeControl1.expectAndDefaultReturn(mockNode1.getNodeValue(), "value1");
-            nodeControl1.expectAndDefaultReturn(mockNode1.getNodeType(), Node.TEXT_NODE);
-
-
-            MockControl nodeListControl1 = MockControl.createControl(NodeList.class);
-            NodeList mockNodeList1 = (NodeList) nodeListControl1.getMock();
-
-            nodeListControl1.expectAndDefaultReturn(mockNodeList1.getLength(), 1);
-            nodeListControl1.expectAndDefaultReturn(mockNodeList1.item(0), mockNode1);
-
-            MockControl paramControl1 = MockControl.createControl(Element.class);
-            Element mockParamElement1 = (Element) paramControl1.getMock();
-            mockParamElement1.getNodeName();
-            paramControl1.setReturnValue("param");
-
-            mockParamElement1.getNodeType();
-            paramControl1.setReturnValue(Node.ELEMENT_NODE);
-
-            mockParamElement1.getAttribute("name");
-            paramControl1.setReturnValue("param1");
-
-            mockParamElement1.getChildNodes();
-            paramControl1.setReturnValue(mockNodeList1);
-
-            nodeControl1.replay();
-            nodeListControl1.replay();
-            paramControl1.replay();
-
-        // <param name="param2">value2</param>
-            MockControl nodeControl2 = MockControl.createControl(Node.class);
-            Node mockNode2 = (Node) nodeControl2.getMock();
-
-            nodeControl2.expectAndDefaultReturn(mockNode2.getNodeValue(), "value2");
-            nodeControl2.expectAndDefaultReturn(mockNode2.getNodeType(), Node.TEXT_NODE);
-
-
-            MockControl nodeListControl2 = MockControl.createControl(NodeList.class);
-            NodeList mockNodeList2 = (NodeList) nodeListControl2.getMock();
-
-            nodeListControl2.expectAndDefaultReturn(mockNodeList2.getLength(), 1);
-            nodeListControl2.expectAndDefaultReturn(mockNodeList2.item(0), mockNode2);
-
-            MockControl paramControl2 = MockControl.createControl(Element.class);
-            Element mockParamElement2 = (Element) paramControl2.getMock();
-            mockParamElement2.getNodeName();
-            paramControl2.setReturnValue("param");
-
-            mockParamElement2.getNodeType();
-            paramControl2.setReturnValue(Node.ELEMENT_NODE);
-
-            mockParamElement2.getAttribute("name");
-            paramControl2.setReturnValue("param2");
-
-            mockParamElement2.getChildNodes();
-            paramControl2.setReturnValue(mockNodeList2);
-
-            nodeControl2.replay();
-            nodeListControl2.replay();
-            paramControl2.replay();
-
-
-        // <some_element>
-        //   ...
-        // </some_element>
-        MockControl elementNodeListControl = MockControl.createControl(NodeList.class);
-        NodeList mockElementNodeList = (NodeList) elementNodeListControl.getMock();
-
-        elementNodeListControl.expectAndDefaultReturn(mockElementNodeList.getLength(), 2);
-        mockElementNodeList.item(0);
-        elementNodeListControl.setReturnValue(mockParamElement2);
-        mockElementNodeList.item(1);
-        elementNodeListControl.setReturnValue(mockParamElement1);
-
-        MockControl elementControl = MockControl.createControl(Element.class);
-        Element element = (Element) elementControl.getMock();
-
-        elementControl.expectAndDefaultReturn(element.getChildNodes(), mockElementNodeList);
-
-
-        elementNodeListControl.replay();
-        elementControl.replay();
-
-
-
-        Map params = XmlHelper.getParams(element);
-
-        nodeControl1.verify();
-            nodeListControl1.verify();
-            paramControl1.verify();
-
-
-        nodeControl2.verify();
-            nodeListControl2.verify();
-            paramControl2.verify();
-
-
-        elementNodeListControl.verify();
-        elementControl.verify();
-
-
-        assertNotNull(params);
-        assertEquals(params.size(), 2);
-        assertEquals(params.get("param1"), "value1");
-        assertEquals(params.get("param2"), "value2");
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
deleted file mode 100644
index 7302359b5..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.conversion.impl;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.test.AnnotationUser;
-import com.opensymphony.xwork2.test.ModelDrivenAnnotationAction2;
-import com.opensymphony.xwork2.util.Bar;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-import ognl.OgnlException;
-import ognl.OgnlRuntime;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-
-/**
- * @author $Author$
- * @author Rainer Hermanns
- * @version $Revision$
- */
-public class AnnotationXWorkConverterTest extends XWorkTestCase {
-
-    ActionContext ac;
-    Map<String, Object> context;
-    XWorkConverter converter;
-
-//    public void testConversionToSetKeepsOriginalSetAndReplacesContents() {
-//        ValueStack stack = ValueStackFactory.getFactory().createValueStack();
-//
-//        Map stackContext = stack.getContext();
-//        stackContext.put(InstantiatingNullHandler.CREATE_NULL_OBJECTS, Boolean.TRUE);
-//        stackContext.put(XWorkMethodAccessor.DENY_METHOD_EXECUTION, Boolean.TRUE);
-//        stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-//
-//        String[] param = new String[] {"abc", "def", "ghi"};
-//        List paramList = Arrays.asList(param);
-//
-//        List originalList = new ArrayList();
-//        originalList.add("jkl");
-//        originalList.add("mno");
-//
-//        AnnotationUser user = new AnnotationUser();
-//        user.setList(originalList);
-//        stack.push(user);
-//
-//        stack.setValue("list", param);
-//
-//        List userList = user.getList();
-//        assertEquals(3,userList.size());
-//        assertEquals(paramList,userList);
-//        assertSame(originalList,userList);
-//    }
-
-    public void testArrayToNumberConversion() {
-        String[] value = new String[]{"12345"};
-        assertEquals(new Integer(12345), converter.convertValue(context, null, null, null, value, Integer.class));
-        assertEquals(new Long(12345), converter.convertValue(context, null, null, null, value, Long.class));
-        value[0] = "123.45";
-        assertEquals(new Float(123.45), converter.convertValue(context, null, null, null, value, Float.class));
-        assertEquals(new Double(123.45), converter.convertValue(context, null, null, null, value, Double.class));
-        value[0] = "1234567890123456789012345678901234567890";
-        assertEquals(new BigInteger(value[0]), converter.convertValue(context, null, null, null, value, BigInteger.class));
-        value[0] = "1234567890123456789.012345678901234567890";
-        assertEquals(new BigDecimal(value[0]), converter.convertValue(context, null, null, null, value, BigDecimal.class));
-    }
-
-    public void testDateConversion() throws ParseException {
-        java.sql.Date sqlDate = new java.sql.Date(System.currentTimeMillis());
-        assertEquals(sqlDate, converter.convertValue(context, null, null, null, sqlDate, Date.class));
-
-        SimpleDateFormat format = new SimpleDateFormat("mm/dd/yyyy hh:mm:ss");
-        Date date = format.parse("01/10/2001 00:00:00");
-        String dateStr = (String) converter.convertValue(context, null, null, null, date, String.class);
-        Date date2 = (Date) converter.convertValue(context, null, null, null, dateStr, Date.class);
-        assertEquals(date, date2);
-    }
-
-    public void testFieldErrorMessageAddedForComplexProperty() {
-        SimpleAnnotationAction action = new SimpleAnnotationAction();
-        action.setBean(new AnnotatedTestBean());
-
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        stack.push(action);
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-        ognlStackContext.put(XWorkConverter.CONVERSION_PROPERTY_FULLNAME, "bean.birth");
-
-        String[] value = new String[]{"invalid date"};
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action.getBean(), null, "birth", value, Date.class));
-        stack.pop();
-
-        Map conversionErrors = (Map) stack.getContext().get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertTrue(conversionErrors.size() == 1);
-        assertEquals(value, conversionErrors.get("bean.birth"));
-    }
-
-    public void testFieldErrorMessageAddedWhenConversionFails() {
-        SimpleAnnotationAction action = new SimpleAnnotationAction();
-        action.setDate(null);
-
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        stack.push(action);
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        String[] value = new String[]{"invalid date"};
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action, null, "date", value, Date.class));
-        stack.pop();
-
-        Map conversionErrors = (Map) ognlStackContext.get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertEquals(1, conversionErrors.size());
-        assertNotNull(conversionErrors.get("date"));
-        assertEquals(value, conversionErrors.get("date"));
-    }
-
-    public void testFieldErrorMessageAddedWhenConversionFailsOnModelDriven() {
-        ModelDrivenAnnotationAction action = new ModelDrivenAnnotationAction();
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        stack.push(action);
-        stack.push(action.getModel());
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        String[] value = new String[]{"invalid date"};
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action, null, "birth", value, Date.class));
-        stack.pop();
-        stack.pop();
-
-        Map conversionErrors = (Map) ognlStackContext.get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertEquals(1, conversionErrors.size());
-        assertNotNull(conversionErrors.get("birth"));
-        assertEquals(value, conversionErrors.get("birth"));
-    }
-
-    public void testFindConversionErrorMessage() {
-        ModelDrivenAnnotationAction action = new ModelDrivenAnnotationAction();
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        stack.push(action);
-        stack.push(action.getModel());
-
-        String message = XWorkConverter.getConversionErrorMessage("birth", stack);
-        assertNotNull(message);
-        assertEquals("Invalid date for birth.", message);
-
-        message = XWorkConverter.getConversionErrorMessage("foo", stack);
-        assertNotNull(message);
-        assertEquals("Invalid field value for field \"foo\".", message);
-    }
-
-    public void testFindConversionMappingForInterface() {
-        ModelDrivenAnnotationAction2 action = new ModelDrivenAnnotationAction2();
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        stack.push(action);
-        stack.push(action.getModel());
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        String value = "asdf:123";
-        Object o = converter.convertValue(ognlStackContext, action.getModel(), null, "barObj", value, Bar.class);
-        assertNotNull(o);
-        assertTrue("class is: " + o.getClass(), o instanceof Bar);
-
-        Bar b = (Bar) o;
-        assertEquals(value, b.getTitle() + ":" + b.getSomethingElse());
-    }
-
-    public void testLocalizedDateConversion() throws Exception {
-        Date date = new Date(System.currentTimeMillis());
-        Locale locale = Locale.GERMANY;
-        DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
-        String dateString = df.format(date);
-        context.put(ActionContext.LOCALE, locale);
-        assertEquals(dateString, converter.convertValue(context, null, null, null, date, String.class));
-    }
-
-    public void testStringArrayToCollection() {
-        List<String> list = new ArrayList<>();
-        list.add("foo");
-        list.add("bar");
-        list.add("baz");
-        assertEquals(list, converter.convertValue(context, null, null, null, new String[]{
-                "foo", "bar", "baz"
-        }, Collection.class));
-    }
-
-    public void testStringArrayToList() {
-        List<String> list = new ArrayList<String>();
-        list.add("foo");
-        list.add("bar");
-        list.add("baz");
-        assertEquals(list, converter.convertValue(context, null, null, null, new String[]{
-                "foo", "bar", "baz"
-        }, List.class));
-    }
-
-    public void testStringArrayToPrimitiveWrappers() {
-        Long[] longs = (Long[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Long[].class);
-        assertNotNull(longs);
-        assertTrue(Arrays.equals(new Long[]{123L, 456L}, longs));
-
-        Integer[] ints = (Integer[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Integer[].class);
-        assertNotNull(ints);
-        assertTrue(Arrays.equals(new Integer[]{123, 456}, ints));
-
-        Double[] doubles = (Double[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Double[].class);
-        assertNotNull(doubles);
-        assertTrue(Arrays.equals(new Double[]{123D, 456D}, doubles));
-
-        Float[] floats = (Float[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Float[].class);
-        assertNotNull(floats);
-        assertTrue(Arrays.equals(new Float[]{123F, 456F}, floats));
-
-        Boolean[] booleans = (Boolean[]) converter.convertValue(context, null, null, null, new String[]{
-                "true", "false"
-        }, Boolean[].class);
-        assertNotNull(booleans);
-        assertTrue(Arrays.equals(new Boolean[]{Boolean.TRUE, Boolean.FALSE}, booleans));
-    }
-
-    public void testStringArrayToPrimitives() throws OgnlException {
-        long[] longs = (long[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, long[].class);
-        assertNotNull(longs);
-        assertTrue(Arrays.equals(new long[]{123, 456}, longs));
-
-        int[] ints = (int[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, int[].class);
-        assertNotNull(ints);
-        assertTrue(Arrays.equals(new int[]{123, 456}, ints));
-
-        double[] doubles = (double[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, double[].class);
-        assertNotNull(doubles);
-        assertTrue(Arrays.equals(new double[]{123, 456}, doubles));
-
-        float[] floats = (float[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, float[].class);
-        assertNotNull(floats);
-        assertTrue(Arrays.equals(new float[]{123, 456}, floats));
-
-        boolean[] booleans = (boolean[]) converter.convertValue(context, null, null, null, new String[]{
-                "true", "false"
-        }, boolean[].class);
-        assertNotNull(booleans);
-        assertTrue(Arrays.equals(new boolean[]{true, false}, booleans));
-    }
-
-    public void testStringArrayToSet() {
-        Set<String> list = new HashSet<>();
-        list.add("foo");
-        list.add("bar");
-        list.add("baz");
-        assertEquals(list, converter.convertValue(context, null, null, null, new String[]{
-                "foo", "bar", "bar", "baz"
-        }, Set.class));
-    }
-
-    // TODO: Fixme... This test does not work with GenericsObjectDeterminer!
-    public void testStringToCollectionConversion() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        Map<String, Object> stackContext = stack.getContext();
-        stackContext.put(ReflectionContextState.CREATE_NULL_OBJECTS, Boolean.TRUE);
-        stackContext.put(ReflectionContextState.DENY_METHOD_EXECUTION, Boolean.TRUE);
-        stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        AnnotationUser user = new AnnotationUser();
-        stack.push(user);
-
-        stack.setValue("list", "asdf");
-        assertNotNull(user.getList());
-        assertEquals(1, user.getList().size());
-        assertEquals(String.class, user.getList().get(0).getClass());
-        assertEquals("asdf", user.getList().get(0));
-    }
-
-    public void testStringToCustomTypeUsingCustomConverter() {
-        // the converter needs to be registered as the Bar.class converter
-        // it won't be detected from the Foo-conversion.properties
-        // because the Foo-conversion.properties file is only used when converting a property of Foo
-        converter.registerConverter(Bar.class.getName(), new FooBarConverter());
-
-        Bar bar = (Bar) converter.convertValue(null, null, null, null, "blah:123", Bar.class);
-        assertNotNull("conversion failed", bar);
-        assertEquals(123, bar.getSomethingElse());
-        assertEquals("blah", bar.getTitle());
-    }
-
-    public void testStringToPrimitiveWrappers() {
-        assertEquals(new Long(123), converter.convertValue(context, null, null, null, "123", Long.class));
-        assertEquals(new Integer(123), converter.convertValue(context, null, null, null, "123", Integer.class));
-        assertEquals(new Double(123.5), converter.convertValue(context, null, null, null, "123.5", Double.class));
-        assertEquals(new Float(123.5), converter.convertValue(context, null, null, null, "123.5", float.class));
-        assertEquals(false, converter.convertValue(context, null, null, null, "false", Boolean.class));
-        assertEquals(true, converter.convertValue(context, null, null, null, "true", Boolean.class));
-    }
-
-    public void testStringToPrimitives() {
-        assertEquals(new Long(123), converter.convertValue(context, null, null, null, "123", long.class));
-        assertEquals(new Integer(123), converter.convertValue(context, null, null, null, "123", int.class));
-        assertEquals(new Double(123.5), converter.convertValue(context, null, null, null, "123.5", double.class));
-        assertEquals(new Float(123.5), converter.convertValue(context, null, null, null, "123.5", float.class));
-        assertEquals(false, converter.convertValue(context, null, null, null, "false", boolean.class));
-        assertEquals(true, converter.convertValue(context, null, null, null, "true", boolean.class));
-        assertEquals(new BigDecimal(123.5), converter.convertValue(context, null, null, null, "123.5", BigDecimal.class));
-        assertEquals(new BigInteger("123"), converter.convertValue(context, null, null, null, "123", BigInteger.class));
-    }
-
-    public void testValueStackWithTypeParameter() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        stack.push(new Foo1());
-        Bar1 bar = (Bar1) stack.findValue("bar", Bar1.class);
-        assertNotNull(bar);
-    }
-
-    public void testGenericProperties() {
-        GenericsBean gb = new GenericsBean();
-        ValueStack stack = ac.getValueStack();
-        stack.push(gb);
-
-        String[] value = new String[] {"123.12", "123.45"};
-        stack.setValue("doubles", value);
-        assertEquals(2, gb.getDoubles().size());
-        assertEquals(Double.class, gb.getDoubles().get(0).getClass());
-        assertEquals(new Double(123.12), gb.getDoubles().get(0));
-        assertEquals(new Double(123.45), gb.getDoubles().get(1));
-    }
-
-    public void testGenericPropertiesFromField() {
-        GenericsBean gb = new GenericsBean();
-        ValueStack stack = ac.getValueStack();
-        stack.push(gb);
-
-        stack.setValue("genericMap[123.12]", "66");
-        stack.setValue("genericMap[456.12]", "42");
-
-        assertEquals(2, gb.getGenericMap().size());
-        assertEquals("66", stack.findValue("genericMap.get(123.12).toString()"));
-        assertEquals("42", stack.findValue("genericMap.get(456.12).toString()"));
-        assertEquals(66, stack.findValue("genericMap.get(123.12)"));
-        assertEquals(42, stack.findValue("genericMap.get(456.12)"));
-        assertEquals(true, stack.findValue("genericMap.containsValue(66)"));
-        assertEquals(true, stack.findValue("genericMap.containsValue(42)"));
-        assertEquals(true, stack.findValue("genericMap.containsKey(123.12)"));
-        assertEquals(true, stack.findValue("genericMap.containsKey(456.12)"));
-    }
-
-    public void testGenericPropertiesFromSetter() {
-        GenericsBean gb = new GenericsBean();
-        ValueStack stack = ac.getValueStack();
-        stack.push(gb);
-
-        stack.setValue("genericMap[123.12]", "66");
-        stack.setValue("genericMap[456.12]", "42");
-
-        assertEquals(2, gb.getGenericMap().size());
-        assertEquals("66", stack.findValue("genericMap.get(123.12).toString()"));
-        assertEquals("42", stack.findValue("genericMap.get(456.12).toString()"));
-        assertEquals(66, stack.findValue("genericMap.get(123.12)"));
-        assertEquals(42, stack.findValue("genericMap.get(456.12)"));
-        assertEquals(true, stack.findValue("genericMap.containsValue(66)"));
-        assertEquals(true, stack.findValue("genericMap.containsValue(42)"));
-        assertEquals(true, stack.findValue("genericMap.containsKey(123.12)"));
-        assertEquals(true, stack.findValue("genericMap.containsKey(456.12)"));
-    }
-
-    public void testGenericPropertiesFromGetter() {
-        GenericsBean gb = new GenericsBean();
-        ValueStack stack = ac.getValueStack();
-        stack.push(gb);
-
-        assertEquals(1, gb.getGetterList().size());
-        assertEquals("42.42", stack.findValue("getterList.get(0).toString()"));
-        assertEquals(new Double(42.42), stack.findValue("getterList.get(0)"));
-        assertEquals(new Double(42.42), gb.getGetterList().get(0));
-
-    }
-
-
-    // FIXME: Implement nested Generics such as: List of Generics List, Map of Generic keys/values, etc...
-    public void no_testGenericPropertiesWithNestedGenerics() {
-        GenericsBean gb = new GenericsBean();
-        ValueStack stack = ac.getValueStack();
-        stack.push(gb);
-
-        stack.setValue("extendedMap[123.12]", new String[] {"1", "2", "3", "4"});
-        stack.setValue("extendedMap[456.12]", new String[] {"5", "6", "7", "8", "9"});
-
-        System.out.println("gb.getExtendedMap(): " + gb.getExtendedMap());
-
-        assertEquals(2, gb.getExtendedMap().size());
-        System.out.println(stack.findValue("extendedMap"));
-        assertEquals(4, stack.findValue("extendedMap.get(123.12).size"));
-        assertEquals(5, stack.findValue("extendedMap.get(456.12).size"));
-
-        assertEquals("1", stack.findValue("extendedMap.get(123.12).get(0)"));
-        assertEquals("5", stack.findValue("extendedMap.get(456.12).get(0)"));
-        assertEquals(Integer.class, stack.findValue("extendedMap.get(123.12).get(0).class"));
-        assertEquals(Integer.class, stack.findValue("extendedMap.get(456.12).get(0).class"));
-
-        assertEquals(List.class, stack.findValue("extendedMap.get(123.12).class"));
-        assertEquals(List.class, stack.findValue("extendedMap.get(456.12).class"));
-
-    }
-
-    public static class Foo1 {
-        public Bar1 getBar() {
-            return new Bar1Impl();
-        }
-    }
-
-    public interface Bar1 {
-    }
-
-    public static class Bar1Impl implements Bar1 {
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        converter = container.getInstance(XWorkConverter.class);
-
-        ac = ActionContext.getContext();
-        ac.setLocale(Locale.US);
-        context = ac.getContextMap();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        ActionContext.setContext(null);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java
deleted file mode 100644
index 6d7ec50e5..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.conversion.impl;
-
-import com.opensymphony.xwork2.util.AnnotatedCat;
-import com.opensymphony.xwork2.util.Bar;
-import com.opensymphony.xwork2.util.Cat;
-
-import java.lang.reflect.Member;
-import java.util.Map;
-
-
-/**
- * @author <a href="mailto:plightbo@cisco.com">Pat Lightbody</a>
- * @author $Author$
- * @version $Revision$
- */
-public class FooBarConverter extends DefaultTypeConverter {
-
-    @Override
-    public Object convertValue(Map<String, Object> context, Object value, Class toType) {
-        if (toType == String.class) {
-            Bar bar = (Bar) value;
-
-            return bar.getTitle() + ":" + bar.getSomethingElse();
-        } else if (toType == Bar.class) {
-            String valueStr = (String) value;
-            int loc = valueStr.indexOf(":");
-            String title = valueStr.substring(0, loc);
-            String rest = valueStr.substring(loc + 1);
-
-            Bar bar = new Bar();
-            bar.setTitle(title);
-            bar.setSomethingElse(Integer.parseInt(rest));
-
-            return bar;
-        } else if (toType == Cat.class) {
-            Cat cat = new Cat();
-            cat.setName((String) value);
-
-            return cat;
-        } else if (toType == AnnotatedCat.class) {
-            AnnotatedCat cat = new AnnotatedCat();
-            cat.setName((String) value);
-
-            return cat;
-        } else {
-            System.out.println("Don't know how to convert between " + value.getClass().getName() +
-                    " and " + toType.getName());
-        }
-
-        return null;
-    }
-
-    @Override
-    public Object convertValue(Map<String, Object> context, Object source, Member member, String property, Object value, Class toClass) {
-        return convertValue(context, value, toClass);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java
deleted file mode 100644
index 86ba9e957..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.opensymphony.xwork2.conversion.impl;
-
-import java.util.Map;
-
-public class FooNumberConverter extends DefaultTypeConverter {
-    @Override
-    public Object convertValue(Map<String, Object> map, Object object, Class aClass) {
-        String s = (String) object;
-
-        int length = s.length();
-        StringBuilder r = new StringBuilder();
-        for (int i = length; i > 0; i--) {
-            r.append(s.charAt(i - 1));
-        }
-
-        return super.convertValue(map, r.toString(), aClass);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java
deleted file mode 100644
index ac9271966..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.conversion.impl;
-
-import junit.framework.TestCase;
-
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
- */
-public class InstantiatingNullHandlerTest extends TestCase {
-
-    public void testBlank() {
-
-    }
-    /*public void testInheritance() {
-        Tiger t = new Tiger();
-        CompoundRoot root = new CompoundRoot();
-        root.add(t);
-
-        Map context = new OgnlContext();
-        context.put(InstantiatingNullHandler.CREATE_NULL_OBJECTS, Boolean.TRUE);
-
-        InstantiatingNullHandler nh = new InstantiatingNullHandler();
-
-        Object dogList = nh.nullPropertyValue(context, root, "dogs");
-        Class clazz = nh.getCollectionType(Tiger.class, "dogs");
-        assertEquals(Dog.class, clazz);
-        assertNotNull(dogList);
-        assertTrue(dogList instanceof List);
-
-        Object kittenList = nh.nullPropertyValue(context, root, "kittens");
-        clazz = nh.getCollectionType(Tiger.class, "kittens");
-        assertEquals(Cat.class, clazz);
-        assertNotNull(kittenList);
-        assertTrue(kittenList instanceof List);
-    }*/
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java
deleted file mode 100644
index 76be6e111..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.opensymphony.xwork2.conversion.impl;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.SimpleFooAction;
-import com.opensymphony.xwork2.XWorkTestCase;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-public class NumberConverterTest extends XWorkTestCase {
-
-    public void testStringToNumberConversionPL() throws Exception {
-        // given
-        NumberConverter converter = new NumberConverter();
-        Map<String, Object> context = new HashMap<>();
-        context.put(ActionContext.LOCALE, new Locale("pl", "PL"));
-
-        SimpleFooAction foo = new SimpleFooAction();
-
-        // when
-        Object value = converter.convertValue(context, foo, null, "id", "1234", Integer.class);
-
-        // then
-        assertEquals(1234, value);
-    }
-
-    public void testStringToNumberConversionUS() throws Exception {
-        // given
-        NumberConverter converter = new NumberConverter();
-        Map<String, Object> context = new HashMap<>();
-        context.put(ActionContext.LOCALE, new Locale("en", "US"));
-
-        SimpleFooAction foo = new SimpleFooAction();
-
-        // when
-        Object value = converter.convertValue(context, foo, null, "id", ",1234", Integer.class);
-
-        // then
-        assertEquals(1234, value);
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java
deleted file mode 100644
index a8fc59e1a..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.opensymphony.xwork2.conversion.impl;
-
-/**
- * <code>ParentClass</code>
- *
- * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @version $Id$
- */
-public class ParentClass {
-
-    public enum NestedEnum {
-        TEST,
-        TEST2,
-        TEST3
-    }
-
-
-    private NestedEnum value;
-
-    public void setValue(NestedEnum value) {
-        this.value = value;
-    }
-
-    public NestedEnum getValue() {
-        return value;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java
deleted file mode 100644
index 7bd49062a..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright 2002-2007,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.conversion.impl;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkException;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.test.annotations.Person;
-
-import java.text.DateFormat;
-import java.util.*;
-
-/**
- * Test case for XWorkBasicConverter
- *
- * @author tm_jee
- * @version $Date$ $Id$
- */
-public class XWorkBasicConverterTest extends XWorkTestCase {
-
-    private XWorkBasicConverter basicConverter;
-
-    // TODO: test for every possible conversion
-    // take into account of empty string
-    // primitive -> conversion error when empty string is passed
-    // object -> return null when empty string is passed
-
-    public void testDateConversionWithEmptyValue() {
-        Object convertedObject = basicConverter.convertValue(new HashMap<String, Object>(), null, null, null, "", Date.class);
-        // we must not get XWorkException as that will caused a conversion error
-        assertNull(convertedObject);
-    }
-
-    public void testDateConversionWithInvalidValue() throws Exception {
-        try {
-            Object convertedObject = basicConverter.convertValue(new HashMap<String, Object>(), null, null, null, "asdsd", Date.class);
-            fail("XWorkException expected - conversion error occurred");
-        } catch (XWorkException e) {
-            // we MUST get this exception as this is a conversion error
-        }
-    }
-
-    public void testDateWithLocalePoland() throws Exception {
-
-        Map<String, Object> map = new HashMap<>();
-        Locale locale = new Locale("pl", "PL");
-        map.put(ActionContext.LOCALE, locale);
-
-        String reference = "2009-01-09";
-        Object convertedObject = basicConverter.convertValue(map, null, null, null, reference, Date.class);
-
-        assertNotNull(convertedObject);
-
-        compareDates(locale, convertedObject);
-    }
-
-    public void testDateWithLocaleFrance() throws Exception {
-
-        Map<String, Object> map = new HashMap<>();
-        Locale locale = new Locale("fr", "FR");
-        map.put(ActionContext.LOCALE, locale);
-
-        String reference = "09/01/2009";
-        Object convertedObject = basicConverter.convertValue(map, null, null, null, reference, Date.class);
-
-        assertNotNull(convertedObject);
-
-        compareDates(locale, convertedObject);
-    }
-
-    public void testDateWithLocaleUK() throws Exception {
-
-        Map<String, Object> map = new HashMap<>();
-        Locale locale = new Locale("en", "US");
-        map.put(ActionContext.LOCALE, locale);
-
-        String reference = "01/09/2009";
-        Object convertedObject = basicConverter.convertValue(map, null, null, null, reference, Date.class);
-
-        assertNotNull(convertedObject);
-
-        compareDates(locale, convertedObject);
-    }
-
-    private void compareDates(Locale locale, Object convertedObject) {
-        Calendar cal = Calendar.getInstance(locale);
-        cal.set(Calendar.YEAR, 2009);
-        cal.set(Calendar.MONTH, Calendar.JANUARY);
-        cal.set(Calendar.DATE, 9);
-
-        Calendar cal1 = Calendar.getInstance(locale);
-        cal1.setTime((Date) convertedObject);
-
-        assertEquals(cal.get(Calendar.YEAR), cal1.get(Calendar.YEAR));
-        assertEquals(cal.get(Calendar.MONTH), cal1.get(Calendar.MONTH));
-        assertEquals(cal.get(Calendar.DATE), cal1.get(Calendar.DATE));
-
-        DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
-        assertEquals(df.format(cal.getTime()), df.format(convertedObject));
-    }
-
-    public void testEmptyArrayConversion() throws Exception {
-        Object convertedObject = basicConverter.convertValue(new HashMap<String, Object>(), null, null, null, new Object[]{}, Object[].class);
-        // we must not get XWorkException as that will caused a conversion error
-        assertEquals(Object[].class, convertedObject.getClass());
-        Object[] obj = (Object[]) convertedObject;
-        assertEquals(0, obj.length);
-    }
-
-    public void testNullArrayConversion() throws Exception {
-        Object convertedObject = basicConverter.convertValue(new HashMap<String, Object>(), null, null, null, null, Object[].class);
-        // we must not get XWorkException as that will caused a conversion error
-        assertNull(convertedObject);
-    }
-
-    /* the code below has been disabled as it causes sideffects in Strtus2 (XW-512)
-    public void testXW490ConvertStringToDouble() throws Exception {
-        Locale locale = new Locale("DA"); // let's use a not common locale such as Denmark
-
-        Map ctx = new HashMap();
-        ctx.put(ActionContext.LOCALE, locale);
-
-        XWorkBasicConverter conv = new XWorkBasicConverter();
-        // decimal seperator is , in Denmark so we should write 123,99 as input
-        Double value = (Double) conv.convertValue(ctx, null, null, null, "123,99", Double.class);
-        assertNotNull(value);
-
-        // output is as expected a real double value converted using Denmark as locale
-        assertEquals(123.99d, value.doubleValue(), 0.001d);
-    }
-
-    public void testXW49ConvertDoubleToString() throws Exception {
-        Locale locale = new Locale("DA"); // let's use a not common locale such as Denmark
-
-        Map ctx = new HashMap();
-        ctx.put(ActionContext.LOCALE, locale);
-
-        XWorkBasicConverter conv = new XWorkBasicConverter();
-        // decimal seperator is , in Denmark so we should write 123,99 as input
-        String value = (String) conv.convertValue(ctx, null, null, null, new Double("123.99"), String.class);
-        assertNotNull(value);
-
-        // output should be formatted according to Danish locale using , as decimal seperator
-        assertEquals("123,99", value);
-    }    
-    */
-
-    public void testDoubleValues() {
-        NumberConverter numberConverter = new NumberConverter();
-
-        assertTrue(numberConverter.isInRange(-1.2, "-1.2", Double.class));
-        assertTrue(numberConverter.isInRange(1.5, "1.5", Double.class));
-
-        Object value = basicConverter.convertValue("-1.3", double.class);
-        assertNotNull(value);
-        assertEquals(-1.3, value);
-
-        value = basicConverter.convertValue("1.8", double.class);
-        assertNotNull(value);
-        assertEquals(1.8, value);
-
-        value = basicConverter.convertValue("-1.9", double.class);
-        assertNotNull(value);
-        assertEquals(-1.9, value);
-
-        value = basicConverter.convertValue("1.7", Double.class);
-        assertNotNull(value);
-        assertEquals(1.7, value);
-
-        value = basicConverter.convertValue("0.0", Double.class);
-        assertNotNull(value);
-        assertEquals(0.0, value);
-
-        value = basicConverter.convertValue("0.0", double.class);
-        assertNotNull(value);
-        assertEquals(0.0, value);
-    }
-
-    public void testFloatValues() {
-        NumberConverter numberConverter = new NumberConverter();
-
-        assertTrue(numberConverter.isInRange(-1.65, "-1.65", Float.class));
-        assertTrue(numberConverter.isInRange(1.9876, "1.9876", float.class));
-
-        Float value = (Float) basicConverter.convertValue("-1.444401", Float.class);
-        assertNotNull(value);
-        assertEquals(Float.valueOf("-1.444401"), value);
-
-        value = (Float) basicConverter.convertValue("1.46464989", Float.class);
-        assertNotNull(value);
-        assertEquals(Float.valueOf(1.46464989f), value);
-    }
-
-    public void testNegativeFloatValue() throws Exception {
-        Object convertedObject = basicConverter.convertValue("-94.1231233", Float.class);
-        assertTrue(convertedObject instanceof Float);
-        assertEquals(-94.1231233f, ((Float) convertedObject).floatValue(), 0.0001);
-    }
-
-    public void testPositiveFloatValue() throws Exception {
-        Object convertedObject = basicConverter.convertValue("94.1231233", Float.class);
-        assertTrue(convertedObject instanceof Float);
-        assertEquals(94.1231233f, ((Float) convertedObject).floatValue(), 0.0001);
-    }
-
-
-    public void testNegativeDoubleValue() throws Exception {
-        Object convertedObject = basicConverter.convertValue("-94.1231233", Double.class);
-        assertTrue(convertedObject instanceof Double);
-        assertEquals(-94.1231233d, ((Double) convertedObject).doubleValue(), 0.0001);
-    }
-
-    public void testPositiveDoubleValue() throws Exception {
-        Object convertedObject = basicConverter.convertValue("94.1231233", Double.class);
-        assertTrue(convertedObject instanceof Double);
-        assertEquals(94.1231233d, ((Double) convertedObject).doubleValue(), 0.0001);
-    }
-
-    public void testNestedEnumValue() throws Exception {
-        Object convertedObject = basicConverter.convertValue(ParentClass.NestedEnum.TEST.name(), ParentClass.NestedEnum.class);
-        assertTrue(convertedObject instanceof ParentClass.NestedEnum);
-        assertEquals(ParentClass.NestedEnum.TEST, convertedObject);
-    }
-
-
-    public void testConvert() {
-        Map<String, Object> context = new HashMap<>();
-        Person o = new Person();
-        String s = "names";
-        Object value = new Person[0];
-        Class toType = String.class;
-        basicConverter.convertValue(context, value, null, s, value, toType);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        basicConverter = container.getInstance(XWorkBasicConverter.class);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        ActionContext.setContext(null);
-    }
-
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java
deleted file mode 100644
index 3d7fc493e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * Copyright 2002-2003,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.conversion.impl;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.ognl.OgnlValueStack;
-import com.opensymphony.xwork2.test.ModelDrivenAction2;
-import com.opensymphony.xwork2.test.User;
-import com.opensymphony.xwork2.util.Bar;
-import com.opensymphony.xwork2.util.Cat;
-import com.opensymphony.xwork2.util.Foo;
-import com.opensymphony.xwork2.util.FurColor;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-import ognl.OgnlException;
-import ognl.OgnlRuntime;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URL;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-
-/**
- * @author $Author$
- * @version $Revision$
- */
-public class XWorkConverterTest extends XWorkTestCase {
-
-    Map<String, Object> context;
-    XWorkConverter converter;
-    OgnlValueStack stack;
-
-//    public void testConversionToSetKeepsOriginalSetAndReplacesContents() {
-//        ValueStack stack = ValueStackFactory.getFactory().createValueStack();
-//
-//        Map stackContext = stack.getContext();
-//        stackContext.put(InstantiatingNullHandler.CREATE_NULL_OBJECTS, Boolean.TRUE);
-//        stackContext.put(XWorkMethodAccessor.DENY_METHOD_EXECUTION, Boolean.TRUE);
-//        stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-//
-//        String[] param = new String[] {"abc", "def", "ghi"};
-//        List paramList = Arrays.asList(param);
-//
-//        List originalList = new ArrayList();
-//        originalList.add("jkl");
-//        originalList.add("mno");
-//
-//        User user = new User();
-//        user.setList(originalList);
-//        stack.push(user);
-//
-//        stack.setValue("list", param);
-//
-//        List userList = user.getList();
-//        assertEquals(3,userList.size());
-//        assertEquals(paramList,userList);
-//        assertSame(originalList,userList);
-//    }
-
-    public void testArrayToNumberConversion() {
-        String[] value = new String[]{"12345"};
-        assertEquals(new Integer(12345), converter.convertValue(context, null, null, null, value, Integer.class));
-        assertEquals(new Long(12345), converter.convertValue(context, null, null, null, value, Long.class));
-        value[0] = "123.45";
-        assertEquals(new Float(123.45), converter.convertValue(context, null, null, null, value, Float.class));
-        assertEquals(new Double(123.45), converter.convertValue(context, null, null, null, value, Double.class));
-        value[0] = "1234567890123456789012345678901234567890";
-        assertEquals(new BigInteger(value[0]), converter.convertValue(context, null, null, null, value, BigInteger.class));
-        value[0] = "1234567890123456789.012345678901234567890";
-        assertEquals(new BigDecimal(value[0]), converter.convertValue(context, null, null, null, value, BigDecimal.class));
-    }
-
-    public void testDateConversion() throws ParseException {
-        java.sql.Date sqlDate = new java.sql.Date(System.currentTimeMillis());
-        assertEquals(sqlDate, converter.convertValue(context, null, null, null, sqlDate, Date.class));
-
-        SimpleDateFormat format = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss");
-        Date date = format.parse("01/10/2001 00:00:00");
-
-        SimpleDateFormat formatt = new SimpleDateFormat("hh:mm:ss");
-        java.sql.Time datet = new java.sql.Time(formatt.parse("10:11:12").getTime());
-
-        String dateStr = (String) converter.convertValue(context, null, null, null, date, String.class);
-        String datetStr = (String) converter.convertValue(context, null, null, null, datet, String.class);
-
-        Date date2 = (Date) converter.convertValue(context, null, null, null, dateStr, Date.class);
-        assertEquals(date, date2);
-        java.sql.Date date3 = (java.sql.Date) converter.convertValue(context, null, null, null, dateStr, java.sql.Date.class);
-        assertEquals(date, date3);
-        java.sql.Timestamp ts = (java.sql.Timestamp) converter.convertValue(context, null, null, null, dateStr, java.sql.Timestamp.class);
-        assertEquals(date, ts);
-        java.sql.Time time1 = (java.sql.Time) converter.convertValue(context, null, null, null, datetStr, java.sql.Time.class);
-        assertEquals(datet, time1);
-    }
-
-    public void testFieldErrorMessageAddedForComplexProperty() {
-        SimpleAction action = new SimpleAction();
-        action.setBean(new TestBean());
-
-        stack.push(action);
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-        ognlStackContext.put(XWorkConverter.CONVERSION_PROPERTY_FULLNAME, "bean.birth");
-
-        String[] value = new String[]{"invalid date"};
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action.getBean(), null, "birth", value, Date.class));
-        stack.pop();
-
-        Map conversionErrors = (Map) stack.getContext().get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertTrue(conversionErrors.size() == 1);
-        assertEquals(value, conversionErrors.get("bean.birth"));
-    }
-
-    public void testFieldErrorMessageAddedWhenConversionFails() {
-        SimpleAction action = new SimpleAction();
-        action.setDate(null);
-
-        stack.push(action);
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        String[] value = new String[]{"invalid date"};
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action, null, "date", value, Date.class));
-        stack.pop();
-
-        Map conversionErrors = (Map) ognlStackContext.get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertEquals(1, conversionErrors.size());
-        assertNotNull(conversionErrors.get("date"));
-        assertEquals(value, conversionErrors.get("date"));
-    }
-
-    public void testFieldErrorMessageAddedWhenConversionFailsOnModelDriven() {
-        ModelDrivenAction action = new ModelDrivenAction();
-        stack.push(action);
-        stack.push(action.getModel());
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        String[] value = new String[]{"invalid date"};
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action, null, "birth", value, Date.class));
-        stack.pop();
-        stack.pop();
-
-        Map conversionErrors = (Map) ognlStackContext.get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertEquals(1, conversionErrors.size());
-        assertNotNull(conversionErrors.get("birth"));
-        assertEquals(value, conversionErrors.get("birth"));
-    }
-
-    public void testDateStrictConversion() throws Exception {
-        // see XW-341
-        String dateStr = "13/01/2005"; // us date format is used in context
-        Object res = converter.convertValue(context, null, null, null, dateStr, Date.class);
-        assertEquals(res, OgnlRuntime.NoConversionPossible);
-
-        dateStr = "02/30/2005"; // us date format is used in context
-        res = converter.convertValue(context, null, null, null, dateStr, Date.class);
-        assertEquals(res, OgnlRuntime.NoConversionPossible);
-
-        // and test a date that is passable
-        SimpleDateFormat format = new SimpleDateFormat("MM/dd/yyyy");
-        dateStr = "12/31/2005"; // us date format
-        res = converter.convertValue(context, null, null, null, dateStr, Date.class);
-        Date date = format.parse(dateStr);
-        assertNotSame(res, OgnlRuntime.NoConversionPossible);
-        assertEquals(date, res);
-    }
-
-
-    public void testFindConversionErrorMessage() {
-        ModelDrivenAction action = new ModelDrivenAction();
-        stack.push(action);
-        stack.push(action.getModel());
-
-        String message = XWorkConverter.getConversionErrorMessage("birth", stack);
-        assertNotNull(message);
-        assertEquals("Invalid date for birth.", message);
-
-        message = XWorkConverter.getConversionErrorMessage("foo", stack);
-        assertNotNull(message);
-        assertEquals("Invalid field value for field \"foo\".", message);
-    }
-
-    public void testFindConversionMappingForInterface() {
-        ModelDrivenAction2 action = new ModelDrivenAction2();
-        stack.push(action);
-        stack.push(action.getModel());
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        String value = "asdf:123";
-        Object o = converter.convertValue(ognlStackContext, action.getModel(), null, "barObj", value, Bar.class);
-        assertNotNull(o);
-        assertTrue(o instanceof Bar);
-
-        Bar b = (Bar) o;
-        assertEquals(value, b.getTitle() + ":" + b.getSomethingElse());
-    }
-
-    public void testLocalizedDateConversion() throws Exception {
-        Date date = new Date(System.currentTimeMillis());
-        Locale locale = Locale.GERMANY;
-        DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
-        String dateString = df.format(date);
-        context.put(ActionContext.LOCALE, locale);
-        assertEquals(dateString, converter.convertValue(context, null, null, null, date, String.class));
-    }
-
-    public void testStringToIntConversions() {
-        SimpleAction action = new SimpleAction();
-        action.setBean(new TestBean());
-
-        stack.push(action);
-
-        Map<String, Object> ognlStackContext = stack.getContext();
-        ognlStackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        assertEquals("Conversion should have failed.", OgnlRuntime.NoConversionPossible, converter.convertValue(ognlStackContext, action.getBean(), null, "count", "111.1", int.class));
-        stack.pop();
-
-        Map conversionErrors = (Map) stack.getContext().get(ActionContext.CONVERSION_ERRORS);
-        assertNotNull(conversionErrors);
-        assertTrue(conversionErrors.size() == 1);
-    }
-
-    public void testStringArrayToCollection() {
-        List<String> list = new ArrayList<>();
-        list.add("foo");
-        list.add("bar");
-        list.add("baz");
-        assertEquals(list, converter.convertValue(context, null, null, null, new String[]{
-                "foo", "bar", "baz"
-        }, Collection.class));
-    }
-
-    public void testStringArrayToList() {
-        List<String> list = new ArrayList<>();
-        list.add("foo");
-        list.add("bar");
-        list.add("baz");
-        assertEquals(list, converter.convertValue(context, null, null, null, new String[]{
-                "foo", "bar", "baz"
-        }, List.class));
-    }
-
-    public void testStringArrayToPrimitiveWrappers() {
-        Long[] longs = (Long[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Long[].class);
-        assertNotNull(longs);
-        assertTrue(Arrays.equals(new Long[]{123L, 456L}, longs));
-
-        Integer[] ints = (Integer[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Integer[].class);
-        assertNotNull(ints);
-        assertTrue(Arrays.equals(new Integer[]{123, 456}, ints));
-
-        Double[] doubles = (Double[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Double[].class);
-        assertNotNull(doubles);
-        assertTrue(Arrays.equals(new Double[]{123D, 456D}, doubles));
-
-        Float[] floats = (Float[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, Float[].class);
-        assertNotNull(floats);
-        assertTrue(Arrays.equals(new Float[]{123F, 456F}, floats));
-
-        Boolean[] booleans = (Boolean[]) converter.convertValue(context, null, null, null, new String[]{
-                "true", "false"
-        }, Boolean[].class);
-        assertNotNull(booleans);
-        assertTrue(Arrays.equals(new Boolean[]{Boolean.TRUE, Boolean.FALSE}, booleans));
-    }
-
-    public void testStringArrayToPrimitives() throws OgnlException {
-        long[] longs = (long[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, long[].class);
-        assertNotNull(longs);
-        assertTrue(Arrays.equals(new long[]{123, 456}, longs));
-
-        int[] ints = (int[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, int[].class);
-        assertNotNull(ints);
-        assertTrue(Arrays.equals(new int[]{123, 456}, ints));
-
-        double[] doubles = (double[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, double[].class);
-        assertNotNull(doubles);
-        assertTrue(Arrays.equals(new double[]{123, 456}, doubles));
-
-        float[] floats = (float[]) converter.convertValue(context, null, null, null, new String[]{
-                "123", "456"
-        }, float[].class);
-        assertNotNull(floats);
-        assertTrue(Arrays.equals(new float[]{123, 456}, floats));
-
-        boolean[] booleans = (boolean[]) converter.convertValue(context, null, null, null, new String[]{
-                "true", "false"
-        }, boolean[].class);
-        assertNotNull(booleans);
-        assertTrue(Arrays.equals(new boolean[]{true, false}, booleans));
-    }
-
-    public void testStringArrayToSet() {
-        Set<String> list = new HashSet<>();
-        list.add("foo");
-        list.add("bar");
-        list.add("baz");
-        assertEquals(list, converter.convertValue(context, null, null, null, new String[]{
-                "foo", "bar", "bar", "baz"
-        }, Set.class));
-    }
-
-    public void testStringToCollectionConversion() {
-        Map<String, Object> stackContext = stack.getContext();
-        stackContext.put(ReflectionContextState.CREATE_NULL_OBJECTS, Boolean.TRUE);
-        stackContext.put(ReflectionContextState.DENY_METHOD_EXECUTION, Boolean.TRUE);
-        stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        User user = new User();
-        stack.push(user);
-
-        stack.setValue("list", "asdf");
-        assertNotNull(user.getList());
-        assertEquals(1, user.getList().size());
-        assertEquals(String.class, user.getList().get(0).getClass());
-        assertEquals("asdf", user.getList().get(0));
-    }
-
-    public void testStringToCustomTypeUsingCustomConverter() {
-        // the converter needs to be registered as the Bar.class converter 
-        // it won't be detected from the Foo-conversion.properties
-        // because the Foo-conversion.properties file is only used when converting a property of Foo
-        converter.registerConverter(Bar.class.getName(), new FooBarConverter());
-
-        Bar bar = (Bar) converter.convertValue(null, null, null, null, "blah:123", Bar.class);
-        assertNotNull("conversion failed", bar);
-        assertEquals(123, bar.getSomethingElse());
-        assertEquals("blah", bar.getTitle());
-    }
-
-    public void testStringToCustomTypeUsingCustomConverterFromProperties() throws Exception {
-
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        try {
-            Thread.currentThread().setContextClassLoader(new ClassLoader(cl) {
-                @Override
-                public Enumeration<URL> getResources(String name) throws IOException {
-                    if ("xwork-conversion.properties".equals(name)) {
-                        return new Enumeration<URL>() {
-                            boolean done = false;
-                            public boolean hasMoreElements() {
-                                return !done;
-                            }
-
-                            public URL nextElement() {
-                                if (done) {
-                                    throw new RuntimeException("Conversion configuration loading " +
-                                        "failed because it asked the enumeration for the next URL " +
-                                        "too many times");
-                                }
-
-                                done = true;
-                                return getClass().getResource("/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties");
-                            }
-                        };
-                    } else {
-                        return super.getResources(name);
-                    }
-                }
-            });
-            setUp();
-        } finally {
-            Thread.currentThread().setContextClassLoader(cl);
-        }
-        Bar bar = (Bar) converter.convertValue(null, null, null, null, "blah:123", Bar.class);
-        assertNotNull("conversion failed", bar);
-        assertEquals(123, bar.getSomethingElse());
-        assertEquals("blah", bar.getTitle());
-    }
-
-    public void testStringToPrimitiveWrappers() {
-        assertEquals(new Long(123), converter.convertValue(context, null, null, null, "123", Long.class));
-        assertEquals(new Integer(123), converter.convertValue(context, null, null, null, "123", Integer.class));
-        assertEquals(new Double(123.5), converter.convertValue(context, null, null, null, "123.5", Double.class));
-        assertEquals(new Float(123.5), converter.convertValue(context, null, null, null, "123.5", float.class));
-        assertEquals(false, converter.convertValue(context, null, null, null, "false", Boolean.class));
-        assertEquals(true, converter.convertValue(context, null, null, null, "true", Boolean.class));
-    }
-
-    public void testStringToPrimitives() {
-        assertEquals(new Long(123), converter.convertValue(context, null, null, null, "123", long.class));
-        assertEquals(new Double(123.5), converter.convertValue(context, null, null, null, "123.5", double.class));
-        assertEquals(new Float(123.5), converter.convertValue(context, null, null, null, "123.5", float.class));
-        assertEquals(false, converter.convertValue(context, null, null, null, "false", boolean.class));
-        assertEquals(true, converter.convertValue(context, null, null, null, "true", boolean.class));
-        assertEquals(new BigDecimal(123.5), converter.convertValue(context, null, null, null, "123.5", BigDecimal.class));
-        assertEquals(new BigInteger("123"), converter.convertValue(context, null, null, null, "123", BigInteger.class));
-    }
-
-    public void testOverflows() {
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Double.MAX_VALUE + "1", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Double.MIN_VALUE + "-1", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Double.MAX_VALUE + "1", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Double.MIN_VALUE + "-1", Double.class));
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Float.MAX_VALUE + "1", float.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Float.MIN_VALUE + "-1", float.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Float.MAX_VALUE + "1", Float.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Float.MIN_VALUE + "-1", Float.class));
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Integer.MAX_VALUE + "1", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Integer.MIN_VALUE + "-1", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Integer.MAX_VALUE + "1", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Integer.MIN_VALUE + "-1", Integer.class));
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Byte.MAX_VALUE + "1", byte.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Byte.MIN_VALUE + "-1", byte.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Byte.MAX_VALUE + "1", Byte.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Byte.MIN_VALUE + "-1", Byte.class));
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Short.MAX_VALUE + "1", short.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Short.MIN_VALUE + "-1", short.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Short.MAX_VALUE + "1", Short.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Short.MIN_VALUE + "-1", Short.class));
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Long.MAX_VALUE + "1", long.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Long.MIN_VALUE + "-1", long.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Long.MAX_VALUE + "1", Long.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, Long.MIN_VALUE + "-1", Long.class));
-    }
-
-    public void testStringToInt() {
-        assertEquals(new Integer(123), converter.convertValue(context, null, null, null, "123", int.class));
-        context.put(ActionContext.LOCALE, Locale.US);
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123.12", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,23", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", int.class));
-        context.put(ActionContext.LOCALE, Locale.GERMANY);
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123.12", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,23", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234", int.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", int.class));
-    }
-
-
-    public void testStringToInteger() {
-        assertEquals(new Integer(123), converter.convertValue(context, null, null, null, "123", Integer.class));
-        context.put(ActionContext.LOCALE, Locale.US);
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123.12", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", Integer.class));
-        assertEquals(new Integer(1234), converter.convertValue(context, null, null, null, "1,234", Integer.class));
-        // WRONG: locale separator is wrongly placed
-        assertEquals(new Integer(123), converter.convertValue(context, null, null, null, "1,23", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", Integer.class));
-
-        context.put(ActionContext.LOCALE, Locale.GERMANY);
-        // WRONG: locale separator is wrongly placed
-        assertEquals(new Integer(12312), converter.convertValue(context, null, null, null, "123.12", Integer.class));
-        assertEquals(new Integer(1234), converter.convertValue(context, null, null, null, "1.234", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,23", Integer.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", Integer.class));
-    }
-
-    public void testStringToPrimitiveDouble() {
-        assertEquals(new Double(123), converter.convertValue(context, null, null, null, "123", double.class));
-        context.put(ActionContext.LOCALE, Locale.US);
-        assertEquals(new Double(123.12), converter.convertValue(context, null, null, null, "123.12", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,23", double.class));
-        assertEquals(new Double(1.234), converter.convertValue(context, null, null, null, "1.234", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", double.class));
-
-        context.put(ActionContext.LOCALE, Locale.GERMANY);
-        assertEquals(new Double(123.12), converter.convertValue(context, null, null, null, "123.12", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,23", double.class));
-        assertEquals(new Double(1.234), converter.convertValue(context, null, null, null, "1.234", double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", double.class));
-    }
-
-    public void testStringToDouble() {
-        assertEquals(new Double(123), converter.convertValue(context, null, null, null, "123", Double.class));
-        context.put(ActionContext.LOCALE, Locale.US);
-        assertEquals(new Double(123.12), converter.convertValue(context, null, null, null, "123.12", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", Double.class));
-        assertEquals(new Double(1234), converter.convertValue(context, null, null, null, "1,234", Double.class));
-        assertEquals(new Double(1234.12), converter.convertValue(context, null, null, null, "1,234.12", Double.class));
-        // WRONG: locale separator is wrongly placed 
-        assertEquals(new Double(123), converter.convertValue(context, null, null, null, "1,23", Double.class));
-        assertEquals(new Double(1.234), converter.convertValue(context, null, null, null, "1.234", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1.234,12", Double.class));
-
-        context.put(ActionContext.LOCALE, Locale.GERMANY);
-        // WRONG: locale separator is wrongly placed
-        assertEquals(new Double(12312), converter.convertValue(context, null, null, null, "123.12", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "123aa", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "aa123", Double.class));
-        assertEquals(new Double(1.234), converter.convertValue(context, null, null, null, "1,234", Double.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "1,234.12", Double.class));
-        assertEquals(new Double(1.23), converter.convertValue(context, null, null, null, "1,23", Double.class));
-        assertEquals(new Double(1234), converter.convertValue(context, null, null, null, "1.234", Double.class));
-        assertEquals(new Double(1234.12), converter.convertValue(context, null, null, null, "1.234,12", Double.class));
-
-    }
-    
-    public void testStringToEnum() {
-        assertEquals(FurColor.BLACK, converter.convertValue(context, null, null, null, "BLACK", FurColor.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "black", FurColor.class));
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, null, null, null, "red", FurColor.class));
-    }
-
-    // Testing for null result on non-primitive Number types supplied as empty String or 
-    public void testNotPrimitiveDefaultsToNull() {
-        assertEquals(null, converter.convertValue(context, null, null, null, null, Double.class));
-        assertEquals(null, converter.convertValue(context, null, null, null, "", Double.class));
-
-        assertEquals(null, converter.convertValue(context, null, null, null, null, Integer.class));
-        assertEquals(null, converter.convertValue(context, null, null, null, "", Integer.class));
-
-        assertEquals(null, converter.convertValue(context, null, null, null, null, Float.class));
-        assertEquals(null, converter.convertValue(context, null, null, null, "", Float.class));
-
-        assertEquals(null, converter.convertValue(context, null, null, null, null, Character.class));
-        assertEquals(null, converter.convertValue(context, null, null, null, "", Character.class));
-
-        assertEquals(null, converter.convertValue(context, null, null, null, null, Long.class));
-        assertEquals(null, converter.convertValue(context, null, null, null, "", Long.class));
-
-        assertEquals(null, converter.convertValue(context, null, null, null, null, Short.class));
-        assertEquals(null, converter.convertValue(context, null, null, null, "", Short.class));
-
-    }
-
-    public void testConvertChar() {
-        assertEquals(new Character('A'), converter.convertValue(context, "A", char.class));
-        assertEquals(new Character('Z'), converter.convertValue(context, "Z", char.class));
-        assertEquals(new Character('A'), converter.convertValue(context, "A", Character.class));
-        assertEquals(new Character('Z'), converter.convertValue(context, "Z", Character.class));
-
-        assertEquals(new Character('A'), converter.convertValue(context, new Character('A'), char.class));
-        assertEquals(new Character('Z'), converter.convertValue(context, new Character('Z'), char.class));
-        assertEquals(new Character('A'), converter.convertValue(context, new Character('A'), Character.class));
-        assertEquals(new Character('Z'), converter.convertValue(context, new Character('Z'), Character.class));
-
-        assertEquals(new Character('D'), converter.convertValue(context, "DEF", char.class));
-        assertEquals(new Character('X'), converter.convertValue(context, "XYZ", Character.class));
-        assertEquals(new Character(' '), converter.convertValue(context, " ", Character.class));
-        assertEquals(new Character(' '), converter.convertValue(context, "   ", char.class));
-
-        assertEquals(null, converter.convertValue(context, "", char.class));
-    }
-
-    public void testConvertClass() {
-        Class clazz = (Class) converter.convertValue(context, "java.util.Date", Class.class);
-        assertEquals(Date.class.getName(), clazz.getName());
-
-        Class clazz2 = (Class) converter.convertValue(context, "com.opensymphony.xwork2.util.Bar", Class.class);
-        assertEquals(Bar.class.getName(), clazz2.getName());
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, "com.opensymphony.xwork2.util.IDoNotExist", Class.class));
-
-        assertEquals(OgnlRuntime.NoConversionPossible, converter.convertValue(context, new Bar(), Class.class)); // only supports string values
-    }
-
-    public void testConvertBoolean() {
-        assertEquals(Boolean.TRUE, converter.convertValue(context, "true", Boolean.class));
-        assertEquals(Boolean.FALSE, converter.convertValue(context, "false", Boolean.class));
-
-        assertEquals(Boolean.TRUE, converter.convertValue(context, Boolean.TRUE, Boolean.class));
-        assertEquals(Boolean.FALSE, converter.convertValue(context, Boolean.FALSE, Boolean.class));
-
-        assertEquals(null, converter.convertValue(context, null, Boolean.class));
-        assertEquals(Boolean.TRUE, converter.convertValue(context, new Bar(), Boolean.class)); // Ognl converter will default to true
-    }
-
-    public void testConvertPrimitiveArraysToString() {
-        assertEquals("2, 3, 1", converter.convertValue(context, new int[]{2, 3, 1}, String.class));
-        assertEquals("100, 200, 300", converter.convertValue(context, new long[]{100, 200, 300}, String.class));
-        assertEquals("1.5, 2.5, 3.5", converter.convertValue(context, new double[]{1.5, 2.5, 3.5}, String.class));
-        assertEquals("true, false, true", converter.convertValue(context, new boolean[]{true, false, true}, String.class));
-    }
-
-    public void testConvertSameCollectionToCollection() {
-        Collection<String> names = new ArrayList<>();
-        names.add("XWork");
-        names.add("Struts");
-
-        Collection col = (Collection) converter.convertValue(context, names, Collection.class);
-        assertSame(names, col);
-    }
-
-    public void testConvertSqlTimestamp() {
-        assertNotNull(converter.convertValue(context, new Timestamp(new Date().getTime()), String.class));
-        assertNotNull(converter.convertValue(null, new Timestamp(new Date().getTime()), String.class));
-    }
-
-    public void testValueStackWithTypeParameter() {
-        stack.push(new Foo1());
-        Bar1 bar = (Bar1) stack.findValue("bar", Bar1.class);
-        assertNotNull(bar);
-    }
-
-    public void testNestedConverters() {
-        Cat cat = new Cat();
-        cat.setFoo(new Foo());
-        stack.push(cat);
-        stack.setValue("foo.number", "123");
-        assertEquals(321, cat.getFoo().getNumber());
-    }
-
-    public void testCollectionConversion() throws Exception {
-        // given
-        String[] col1 = new String[]{"1", "2", "ble", "3"};
-
-        // when
-        Object converted = converter.convertValue(context, new ListAction(), null, "ints", col1, List.class);
-
-        // then
-        assertEquals(converted, Arrays.asList(1, 2, 3));
-    }
-
-    public static class Foo1 {
-        public Bar1 getBar() {
-            return new Bar1Impl();
-        }
-    }
-
-    public interface Bar1 {
-    }
-
-    public static class Bar1Impl implements Bar1 {
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        converter = container.getInstance(XWorkConverter.class);
-
-        ActionContext ac = ActionContext.getContext();
-        ac.setLocale(Locale.US);
-        context = ac.getContextMap();
-        stack = (OgnlValueStack) ac.getValueStack();
-    }
-
-}
-
-class ListAction {
-
-    private List<Integer> ints = new ArrayList<>();
-
-    public List<Integer> getInts() {
-        return ints;
-    }
-
-    public void setInts(List<Integer> ints) {
-        this.ints = ints;
-    }
-
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultAction.java
deleted file mode 100644
index d97c59aea..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultAction.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.opensymphony.xwork2.interceptor.annotations;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * @author martin.gilday
- *
- */
-public class AllowingByDefaultAction extends ActionSupport {
-	
-	@Blocked
-	private String name;
-	private String job;
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public void setJob(String job) {
-		this.job = job;
-	}
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultModel.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultModel.java
deleted file mode 100644
index e31557748..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultModel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.opensymphony.xwork2.interceptor.annotations;
-
-
-/**
- * @author jafl
- *
- */
-public class AllowingByDefaultModel {
-	
-	@Blocked
-	private String m1;
-	private String m2;
-	
-	public void setM1(String s) {
-		m1 = s;
-	}
-	
-	public void setM2(String s) {
-		m2 = s;
-	}
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotatedAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotatedAction.java
deleted file mode 100644
index 6698088d2..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotatedAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.interceptor.annotations;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Zsolt Szasz, zsolt at lorecraft dot com
- * @author Rainer Hermanns
- */
-public class AnnotatedAction extends BaseAnnotatedAction {
-
-    @Before(priority=5)
-	public String before() {
-		log = log + "before";
-		return null;
-	}
-	
-	public String execute() {
-		log = log + "-execute";
-		return Action.SUCCESS;
-	}
-	
-	@BeforeResult
-	public void beforeResult() throws Exception {
-		log = log +"-beforeResult";
-	}
-	
-	@After(priority=5)
-	public void after() {
-		log = log + "-after";
-	}
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java
deleted file mode 100644
index d1ea4ca79..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.opensymphony.xwork2.interceptor.annotations;
-
-import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.StubValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
-import junit.framework.TestCase;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author martin.gilday
- * @author jafl
- *
- */
-public class AnnotationParameterFilterUnitTest extends TestCase {
-
-	ValueStack stack;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		stack = new StubValueStack();
-	}
-
-	/**
-	 * Only "name" should remain in the parameter map.  All others
-	 * should be removed
-	 * @throws Exception
-	 */
-	public void testBlockingByDefault() throws Exception {
-
-		Map<String, Object> contextMap = new HashMap<>();
-		Map<String, Object> parameterMap = new HashMap<>();
-		
-		parameterMap.put("job", "Baker");
-		parameterMap.put("name", "Martin");
-		
-		contextMap.put(ActionContext.PARAMETERS, parameterMap);
-		
-		Action action = new BlockingByDefaultAction();
-		stack.push(action);
-		
-		Mock mockInvocation = new Mock(ActionInvocation.class);
-		mockInvocation.expectAndReturn("getInvocationContext", new ActionContext(contextMap));
-		mockInvocation.matchAndReturn("getAction", action);
-		mockInvocation.matchAndReturn("getStack", stack);
-		mockInvocation.expectAndReturn("invoke", Action.SUCCESS);
-		
-		ActionInvocation invocation = (ActionInvocation) mockInvocation.proxy();
-		
-		AnnotationParameterFilterIntereptor intereptor = new AnnotationParameterFilterIntereptor();
-		intereptor.intercept(invocation);
-
-		assertEquals("Parameter map should contain one entry", 1, parameterMap.size());
-		assertNull(parameterMap.get("job"));
-		assertNotNull(parameterMap.get("name"));
-		
-	}
-
-	/**
-	 * "name" should be removed from the map, as it is blocked.
-	 * All other parameters should remain
-	 * @throws Exception
-	 */
-	public void testAllowingByDefault() throws Exception {
-
-		Map<String, Object> contextMap = new HashMap<>();
-		Map<String, Object> parameterMap = new HashMap<>();
-		
-		parameterMap.put("job", "Baker");
-		parameterMap.put("name", "Martin");
-		
-		contextMap.put(ActionContext.PARAMETERS, parameterMap);
-		
-		Action action = new AllowingByDefaultAction();
-		stack.push(action);
-		
-		Mock mockInvocation = new Mock(ActionInvocation.class);
-		mockInvocation.expectAndReturn("getInvocationContext", new ActionContext(contextMap));
-		mockInvocation.matchAndReturn("getAction", action);
-		mockInvocation.matchAndReturn("getStack", stack);
-		mockInvocation.expectAndReturn("invoke", Action.SUCCESS);
-		
-		ActionInvocation invocation = (ActionInvocation) mockInvocation.proxy();
-		
-		AnnotationParameterFilterIntereptor intereptor = new AnnotationParameterFilterIntereptor();
-		intereptor.intercept(invocation);
-		
-		assertEquals("Paramter map should contain one entry", 1, parameterMap.size());
-		assertNotNull(parameterMap.get("job"));
-		assertNull(parameterMap.get("name"));
-		
-	}
-
-	/**
-	 * Only "name" should remain in the parameter map.  All others
-	 * should be removed
-	 * @throws Exception
-	 */
-	public void testBlockingByDefaultWithModel() throws Exception {
-
-		Map<String, Object> contextMap = new HashMap<>();
-		Map<String, Object> parameterMap = new HashMap<>();
-		
-		parameterMap.put("job", "Baker");
-		parameterMap.put("name", "Martin");
-		parameterMap.put("m1", "s1");
-		parameterMap.put("m2", "s2");
-		
-		contextMap.put(ActionContext.PARAMETERS, parameterMap);
-		stack.push(new BlockingByDefaultModel());
-		
-		Mock mockInvocation = new Mock(ActionInvocation.class);
-		mockInvocation.expectAndReturn("getInvocationContext", new ActionContext(contextMap));
-		mockInvocation.matchAndReturn("getAction", new BlockingByDefaultAction());
-		mockInvocation.matchAndReturn("getStack", stack);
-		mockInvocation.expectAndReturn("invoke", Action.SUCCESS);
-		
-		ActionInvocation invocation = (ActionInvocation) mockInvocation.proxy();
-		
-		AnnotationParameterFilterIntereptor intereptor = new AnnotationParameterFilterIntereptor();
-		intereptor.intercept(invocation);
-		
-		assertEquals("Paramter map should contain two entries", 2, parameterMap.size());
-		assertNull(parameterMap.get("job"));
-		assertNotNull(parameterMap.get("name"));
-		assertNotNull(parameterMap.get("m1"));
-		assertNull(parameterMap.get("m2"));
-		
-	}
-
-	/**
-	 * "name" should be removed from the map, as it is blocked.
-	 * All other parameters should remain
-	 * @throws Exception
-	 */
-	public void testAllowingByDefaultWithModel() throws Exception {
-
-		Map<String, Object> contextMap = new HashMap<>();
-		Map<String, Object> parameterMap = new HashMap<>();
-		
-		parameterMap.put("job", "Baker");
-		parameterMap.put("name", "Martin");
-		parameterMap.put("m1", "s1");
-		parameterMap.put("m2", "s2");
-		
-		contextMap.put(ActionContext.PARAMETERS, parameterMap);
-		stack.push(new AllowingByDefaultModel());
-		
-		Mock mockInvocation = new Mock(ActionInvocation.class);
-		mockInvocation.expectAndReturn("getInvocationContext", new ActionContext(contextMap));
-		mockInvocation.matchAndReturn("getAction", new AllowingByDefaultAction());
-		mockInvocation.matchAndReturn("getStack", stack);
-		mockInvocation.expectAndReturn("invoke", Action.SUCCESS);
-		
-		ActionInvocation invocation = (ActionInvocation) mockInvocation.proxy();
-		
-		AnnotationParameterFilterIntereptor intereptor = new AnnotationParameterFilterIntereptor();
-		intereptor.intercept(invocation);
-		
-		assertEquals("Paramter map should contain two entries", 2, parameterMap.size());
-		assertNotNull(parameterMap.get("job"));
-		assertNull(parameterMap.get("name"));
-		assertNull(parameterMap.get("m1"));
-		assertNotNull(parameterMap.get("m2"));
-		
-	}
-	
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
deleted file mode 100644
index e8b8d4f30..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.interceptor.annotations;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.mock.MockResult;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-
-import java.util.Collections;
-
-/**
- * @author Zsolt Szasz, zsolt at lorecraft dot com
- * @author Rainer Hermanns
- */
-public class AnnotationWorkflowInterceptorTest extends XWorkTestCase {
-    private static final String ANNOTATED_ACTION = "annotatedAction";
-    private static final String SHORTCIRCUITED_ACTION = "shortCircuitedAction";
-    private final AnnotationWorkflowInterceptor annotationWorkflow = new AnnotationWorkflowInterceptor();
-
-    @Override
-    public void setUp() throws Exception{
-        super.setUp();
-        XmlConfigurationProvider provider = new XmlConfigurationProvider("xwork-default.xml");
-        container.inject(provider);
-        loadConfigurationProviders(provider, new MockConfigurationProvider());
-    }
-
-    public void testInterceptsBeforeAndAfter() throws Exception {
-        ActionProxy proxy = actionProxyFactory.createActionProxy("", ANNOTATED_ACTION, null);
-        assertEquals(Action.SUCCESS, proxy.execute());
-        AnnotatedAction action = (AnnotatedAction)proxy.getInvocation().getAction();
-        assertEquals("baseBefore-before-execute-beforeResult-after", action.log);
-    }
-
-    public void testInterceptsShortcircuitedAction() throws Exception {
-        ActionProxy proxy = actionProxyFactory.createActionProxy("", SHORTCIRCUITED_ACTION, null);
-        assertEquals("shortcircuit", proxy.execute());
-        ShortcircuitedAction action = (ShortcircuitedAction)proxy.getInvocation().getAction();
-        assertEquals("baseBefore-before", action.log);
-    }
-
-    private class MockConfigurationProvider implements ConfigurationProvider {
-        private Configuration config;
-
-        public void init(Configuration configuration) throws ConfigurationException {
-            this.config = configuration;
-        }
-
-        public boolean needsReload() {
-            return false;
-        }
-
-        public void destroy() { }
-
-
-        public void register(ContainerBuilder builder, LocatableProperties props) throws ConfigurationException {
-            if (!builder.contains(ObjectFactory.class)) {
-                builder.factory(ObjectFactory.class);
-            }
-            if (!builder.contains(ActionProxyFactory.class)) {
-                builder.factory(ActionProxyFactory.class, DefaultActionProxyFactory.class);
-            }
-        }
-
-        public void loadPackages() throws ConfigurationException {
-            PackageConfig packageConfig = new PackageConfig.Builder("default")
-                    .addActionConfig(ANNOTATED_ACTION, new ActionConfig.Builder("defaultPackage", ANNOTATED_ACTION, AnnotatedAction.class.getName())
-                            .addInterceptors(Collections.singletonList(new InterceptorMapping("annotationWorkflow", annotationWorkflow)))
-                            .addResultConfig(new ResultConfig.Builder("success", MockResult.class.getName()).build())
-                            .build())
-                    .addActionConfig(SHORTCIRCUITED_ACTION, new ActionConfig.Builder("defaultPackage", SHORTCIRCUITED_ACTION, ShortcircuitedAction.class.getName())
-                            .addInterceptors(Collections.singletonList(new InterceptorMapping("annotationWorkflow", annotationWorkflow)))
-                            .addResultConfig(new ResultConfig.Builder("shortcircuit", MockResult.class.getName()).build())
-                            .build())
-                    .build();
-            config.addPackageConfig("defaultPackage", packageConfig);
-            config.addPackageConfig("default", new PackageConfig.Builder(packageConfig).name("default").build());
-        }
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BaseAnnotatedAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BaseAnnotatedAction.java
deleted file mode 100644
index ed088f16e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BaseAnnotatedAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.interceptor.annotations;
-
-/**
- * @author Zsolt Szasz, zsolt at lorecraft dot com
- * @author Rainer Hermanns
- */
-public class BaseAnnotatedAction {
-
-	protected String log = "";
-	
-	@Before
-	public String baseBefore() {
-		log = log + "baseBefore-";
-		return null;
-	}
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultAction.java
deleted file mode 100644
index 509fb721e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.opensymphony.xwork2.interceptor.annotations;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * @author martin.gilday
- *
- */
-@BlockByDefault
-public class BlockingByDefaultAction extends ActionSupport {
-	
-	@Allowed
-	private String name;
-	private String job;
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public void setJob(String job) {
-		this.job = job;
-	}
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultModel.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultModel.java
deleted file mode 100644
index f3b6fbe70..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultModel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.opensymphony.xwork2.interceptor.annotations;
-
-/**
- * @author jafl
- *
- */
-@BlockByDefault
-public class BlockingByDefaultModel {
-	
-	@Allowed
-	private String m1;
-	private String m2;
-	
-	public void setM1(String s) {
-		m1 = s;
-	}
-	
-	public void setM2(String s) {
-		m2 = s;
-	}
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java
deleted file mode 100644
index bfbd48cb6..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.interceptor.annotations;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Zsolt Szasz, zsolt at lorecraft dot com
- * @author Rainer Hermanns
- */
-public class ShortcircuitedAction extends BaseAnnotatedAction {	
-	@Before(priority=5)
-	public String before() {
-		log = log + "before";
-		return "shortcircuit";
-	}
-	
-	public String execute() {
-		log = log + "-execute-";
-		return Action.SUCCESS;
-	}
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessorTest.java
deleted file mode 100644
index 6942a1f9f..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessorTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2005 Opensymphony. All Rights Reserved.
- */
-package com.opensymphony.xwork2.ognl.accessor;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ListHolder;
-import com.opensymphony.xwork2.util.ValueStack;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * XWorkListPropertyAccessorTest
- * <p/>
- * Created : Nov 7, 2005 3:54:44 PM
- *
- * @author Jason Carreira <jcarreira@eplus.com>
- */
-public class XWorkListPropertyAccessorTest extends XWorkTestCase {
-
-    public void testContains() {
-        ValueStack vs = ActionContext.getContext().getValueStack();
-        ListHolder listHolder = new ListHolder();
-        vs.push(listHolder);
-
-        vs.setValue("longs", new String[] {"1", "2", "3"});
-
-        assertNotNull(listHolder.getLongs());
-        assertEquals(3, listHolder.getLongs().size());
-        assertEquals(new Long(1), (Long) listHolder.getLongs().get(0));
-        assertEquals(new Long(2), (Long) listHolder.getLongs().get(1));
-        assertEquals(new Long(3), (Long) listHolder.getLongs().get(2));
-
-        assertTrue(((Boolean) vs.findValue("longs.contains(1)")).booleanValue());
-    }
-
-    public void testCanAccessListSizeProperty() {
-        ValueStack vs = ActionContext.getContext().getValueStack();
-        List myList = new ArrayList();
-        myList.add("a");
-        myList.add("b");
-
-        ListHolder listHolder = new ListHolder();
-        listHolder.setStrings(myList);
-
-        vs.push(listHolder);
-
-        assertEquals(new Integer(myList.size()), vs.findValue("strings.size()"));
-        assertEquals(new Integer(myList.size()), vs.findValue("strings.size"));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java
deleted file mode 100644
index b399edf8b..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Created on 6/11/2004
- */
-package com.opensymphony.xwork2.spring.interceptor;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Simon Stewart
- */
-public class ActionAutowiringInterceptorTest extends XWorkTestCase {
-
-    public void testShouldAutowireAction() throws Exception {
-        StaticWebApplicationContext context = new StaticWebApplicationContext();
-        context.getBeanFactory().registerSingleton("bean", new TestBean());
-        TestBean bean = (TestBean) context.getBean("bean");
-
-        loadSpringApplicationContextIntoApplication(context);
-
-        SimpleAction action = new SimpleAction();
-        ActionInvocation invocation = new TestActionInvocation(action);
-
-        ActionAutowiringInterceptor interceptor = new ActionAutowiringInterceptor();
-        interceptor.setApplicationContext(context);
-        interceptor.init();
-
-        interceptor.intercept(invocation);
-
-        assertEquals(bean, action.getBean());
-    }
-
-    public void testSetAutowireType() throws Exception {
-        XmlConfigurationProvider prov = new XmlConfigurationProvider("xwork-default.xml");
-        container.inject(prov);
-        prov.setThrowExceptionOnDuplicateBeans(false);
-        XmlConfigurationProvider c = new XmlConfigurationProvider("com/opensymphony/xwork2/spring/xwork-autowire.xml");
-        container.inject(c);
-        loadConfigurationProviders(c, prov);
-
-        StaticWebApplicationContext appContext = new StaticWebApplicationContext();
-
-        loadSpringApplicationContextIntoApplication(appContext);
-
-        ActionAutowiringInterceptor interceptor = new ActionAutowiringInterceptor();
-        interceptor.init();
-
-        SimpleAction action = new SimpleAction();
-        ActionInvocation invocation = new TestActionInvocation(action);
-
-        interceptor.intercept(invocation);
-
-        ApplicationContext loadedContext = interceptor.getApplicationContext();
-
-        assertEquals(appContext, loadedContext);
-    }
-
-    protected void loadSpringApplicationContextIntoApplication(ApplicationContext appContext) {
-        Map<Object, Object> application = new HashMap<>();
-        application.put(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, appContext);
-
-        Map<String, Object> context = new HashMap<>();
-        context.put(ActionContext.APPLICATION, application);
-        ActionContext actionContext = new ActionContext(context);
-        ActionContext.setContext(actionContext);
-    }
-
-    public void testLoadsApplicationContextUsingWebApplicationContextUtils() throws Exception {
-        StaticWebApplicationContext appContext = new StaticWebApplicationContext();
-
-        loadSpringApplicationContextIntoApplication(appContext);
-
-        ActionAutowiringInterceptor interceptor = new ActionAutowiringInterceptor();
-        interceptor.init();
-
-        SimpleAction action = new SimpleAction();
-        ActionInvocation invocation = new TestActionInvocation(action);
-
-        interceptor.intercept(invocation);
-
-        ApplicationContext loadedContext = interceptor.getApplicationContext();
-
-        assertEquals(appContext, loadedContext);
-    }
-
-    public void testIfApplicationContextIsNullThenBeanWillNotBeWiredUp() throws Exception {
-        Map<String, Object> context = new HashMap<>();
-        context.put(ActionContext.APPLICATION, new HashMap());
-        ActionContext actionContext = new ActionContext(context);
-        ActionContext.setContext(actionContext);
-
-        ActionAutowiringInterceptor interceptor = new ActionAutowiringInterceptor();
-        interceptor.init();
-
-        SimpleAction action = new SimpleAction();
-        ActionInvocation invocation = new TestActionInvocation(action);
-        TestBean bean = action.getBean();
-
-        // If an exception is thrown here, things are going to go wrong in
-        // production
-        interceptor.intercept(invocation);
-
-        assertEquals(bean, action.getBean());
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java b/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java
deleted file mode 100644
index dd403b11e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Created on 6/11/2004
- */
-package com.opensymphony.xwork2.spring.interceptor;
-
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.ValueStack;
-
-import java.lang.reflect.Method;
-
-/**
- * @author Simon Stewart
- */
-public class TestActionInvocation implements ActionInvocation {
-    private Object action;
-    private boolean executed;
-
-    public TestActionInvocation(Object wrappedAction) {
-        this.action = wrappedAction;
-    }
-
-    public Object getAction() {
-        return action;
-    }
-
-    public boolean isExecuted() {
-        return executed;
-    }
-
-    public ActionContext getInvocationContext() {
-        return null;
-    }
-
-    public ActionProxy getProxy() {
-        return null;
-    }
-
-    public Result getResult() throws Exception {
-        return null;
-    }
-
-    public String getResultCode() {
-        return null;
-    }
-
-    public void setResultCode(String resultCode) {
-
-    }
-
-    public ValueStack getStack() {
-        return null;
-    }
-
-    public void addPreResultListener(PreResultListener listener) {
-    }
-
-    public String invoke() throws Exception {
-        return invokeActionOnly();
-    }
-
-    public String invokeActionOnly() throws Exception {
-        executed = true;
-        Method method = action.getClass().getMethod("execute", new Class[0]);
-        return (String) method.invoke(action, new Object[0]);
-    }
-
-    public void setActionEventListener(ActionEventListener listener) {
-    }
-
-    public void init(ActionProxy proxy)  {
-    }
-
-    public ActionInvocation serialize() {
-        return this;
-    }
-
-    public ActionInvocation deserialize(ActionContext actionContext) {
-        return this;
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Address.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Address.java
deleted file mode 100644
index 8fe3bc8c6..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Address.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-public class Address {
-    private String line1;
-    private String line2;
-    private String city;
-    private String country;
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getLine1() {
-        return line1;
-    }
-
-    public void setLine1(String line1) {
-        this.line1 = line1;
-    }
-
-    public String getLine2() {
-        return line2;
-    }
-
-    public void setLine2(String line2) {
-        this.line2 = line2;
-    }
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/AddressTypeConverter.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/AddressTypeConverter.java
deleted file mode 100644
index f0eadebf0..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/AddressTypeConverter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter;
-
-import java.util.Map;
-
-public class AddressTypeConverter extends DefaultTypeConverter {
-	@Override public Object convertValue(Map<String, Object> context, Object value, Class toType) {
-		if(value instanceof String) {
-			return decodeAddress((String)value);
-		} else if(value instanceof String && value.getClass().isArray()) {
-			return decodeAddress(((String[])value)[0]);
-		} else {
-			Address address = (Address)value;
-			return address.getLine1() + ":" + address.getLine2() + ":" +
-			       address.getCity() + ":" + address.getCountry();
-		}
-	}
-
-	private Address decodeAddress(String encodedAddress) {
-		String[] parts = ((String)encodedAddress).split(":");
-		Address address = new Address();
-		address.setLine1(parts[0]);
-		address.setLine2(parts[1]);
-		address.setCity(parts[2]);
-		address.setCountry(parts[3]);
-		return address;
-	}
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java
deleted file mode 100644
index 4c47ee8f1..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-public class Person {
-	private String firstName;
-	private String lastName;
-	
-	public String getFirstName() {
-		return firstName;
-	}
-	
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-	
-	public String getLastName() {
-		return lastName;
-	}
-	
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java
deleted file mode 100644
index 72e20ef8e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-import com.opensymphony.xwork2.conversion.annotations.Conversion;
-import com.opensymphony.xwork2.conversion.annotations.ConversionType;
-import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
-import com.opensymphony.xwork2.util.Element;
-
-import java.util.List;
-
-@Conversion(
-	conversions={
-		@TypeConversion(type=ConversionType.APPLICATION,
-						key="com.opensymphony.xwork2.test.annotations.Address",
-						converter="com.opensymphony.xwork2.test.annotations.AddressTypeConverter"),
-		@TypeConversion(type=ConversionType.APPLICATION,
-						key="com.opensymphony.xwork2.test.annotations.Person",
-						converter="com.opensymphony.xwork2.test.annotations.PersonTypeConverter")})
-public class PersonAction {
-	List<Person> users;
-	private List<Address> address;
-	@Element(com.opensymphony.xwork2.test.annotations.Address.class)
-	private List addressesNoGenericElementAnnotation;
-
-	public List<Person> getUsers() {
-		return users;
-	}
-
-	public void setUsers(List<Person> users) {
-		this.users = users;
-	}
-
-	public void setAddress(List<Address> address) {
-		this.address = address;
-	}
-
-	public List<Address> getAddress() {
-		return address;
-	}
-
-	public void setAddressesNoGenericElementAnnotation(List addressesNoGenericElementAnnotation) {
-		this.addressesNoGenericElementAnnotation = addressesNoGenericElementAnnotation;
-	}
-
-	public List getAddressesNoGenericElementAnnotation() {
-		return addressesNoGenericElementAnnotation;
-	}
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java
deleted file mode 100644
index 2f18b4d15..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-
-import java.util.Map;
-
-
-public class PersonActionTest extends XWorkTestCase {
-    
-	public void testAddPerson() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-
-        Map<String, Object> stackContext = stack.getContext();
-        stackContext.put(ReflectionContextState.CREATE_NULL_OBJECTS, Boolean.TRUE);
-        stackContext.put(ReflectionContextState.DENY_METHOD_EXECUTION, Boolean.TRUE);
-        stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-        PersonAction action = new PersonAction();
-        stack.push(action);
-
-        stack.setValue("users", "jonathan:gerrish");
-        assertNotNull(action.getUsers());
-        assertEquals(1, action.getUsers().size());
-        
-        for(Object person : action.getUsers()) {
-        	System.out.println("Person: " + person);
-        }
-        
-        assertEquals(Person.class, action.getUsers().get(0).getClass());
-        assertEquals("jonathan", action.getUsers().get(0).getFirstName());
-        assertEquals("gerrish", action.getUsers().get(0).getLastName());
-	}
-	
-	public void testAddAddress() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-		Map<String, Object> stackContext = stack.getContext();
-		stackContext.put(ReflectionContextState.CREATE_NULL_OBJECTS, Boolean.TRUE);
-		stackContext.put(ReflectionContextState.DENY_METHOD_EXECUTION, Boolean.TRUE);
-		stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-		PersonAction action = new PersonAction();
-		stack.push(action);
-
-		stack.setValue("address", "2 Chandos Court:61 Haverstock Hill:London:England");
-		assertNotNull(action.getAddress());
-		assertEquals(1, action.getAddress().size());
-
-		for(Object address : action.getAddress()) {
-			System.out.println("Address: " + address);
-		}
-
-		assertEquals(Address.class, action.getAddress().get(0).getClass());
-		assertEquals("2 Chandos Court", action.getAddress().get(0).getLine1());
-		assertEquals("61 Haverstock Hill", action.getAddress().get(0).getLine2());
-		assertEquals("London", action.getAddress().get(0).getCity());
-		assertEquals("England", action.getAddress().get(0).getCountry());
-	}
-	
-	public void testAddAddressesNoGenericElementAnnotation() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-		Map<String, Object> stackContext = stack.getContext();
-		stackContext.put(ReflectionContextState.CREATE_NULL_OBJECTS, Boolean.TRUE);
-		stackContext.put(ReflectionContextState.DENY_METHOD_EXECUTION, Boolean.TRUE);
-		stackContext.put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
-
-		PersonAction action = new PersonAction();
-		stack.push(action);
-
-		stack.setValue("addressesNoGenericElementAnnotation", "2 Chandos Court:61 Haverstock Hill:London:England");
-		assertNotNull(action.getAddressesNoGenericElementAnnotation());
-		assertEquals(1, action.getAddressesNoGenericElementAnnotation().size());
-
-		for(Object address : action.getAddressesNoGenericElementAnnotation()) {
-			System.out.println("Address: " + address);
-		}
-
-		assertEquals(Address.class, action.getAddressesNoGenericElementAnnotation().get(0).getClass());
-		assertEquals("2 Chandos Court", ((Address)action.getAddressesNoGenericElementAnnotation().get(0)).getLine1());
-		assertEquals("61 Haverstock Hill", ((Address)action.getAddressesNoGenericElementAnnotation().get(0)).getLine2());
-		assertEquals("London", ((Address)action.getAddressesNoGenericElementAnnotation().get(0)).getCity());
-		assertEquals("England", ((Address)action.getAddressesNoGenericElementAnnotation().get(0)).getCountry());
-	}
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java
deleted file mode 100644
index 6e27615c7..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter;
-
-import java.util.Map;
-
-public class PersonTypeConverter extends DefaultTypeConverter {
-	@Override
-    public Object convertValue(Map<String, Object> context, Object value, Class toType) {
-		if(value instanceof String) {
-			return decodePerson((String)value);
-		} else if(value instanceof String && value.getClass().isArray()) {
-			return decodePerson(((String[])value)[0]);
-		} else {
-			Person person = (Person)value;
-			return person.getFirstName() + ":" + person.getLastName();
-		}
-	}
-
-	private Person decodePerson(String encodedPerson) {
-		String[] parts = ((String)encodedPerson).split(":");
-		Person person = new Person();
-		person.setFirstName(parts[0]);
-		person.setLastName(parts[1]);
-		return person;
-	}
-}
\ No newline at end of file
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java
deleted file mode 100644
index 5e2bb2a5a..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.opensymphony.xwork2.test.annotations;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.validator.annotations.ExpressionValidator;
-import com.opensymphony.xwork2.validator.annotations.Validation;
-
-/**
- * <code>ValidateAnnotatedMethodOnlyAction</code>
- *
- * @author <a href="mailto:hermanns@aixcept.de">Rainer Hermanns</a>
- * @version $Id$
- */
-@Validation
-public class ValidateAnnotatedMethodOnlyAction extends ActionSupport {
-
-    String param1;
-    String param2;
-
-
-    public String getParam1() {
-        return param1;
-    }
-
-    public void setParam1(String param1) {
-        this.param1 = param1;
-    }
-
-    public String getParam2() {
-        return param2;
-    }
-
-    public void setParam2(String param2) {
-        this.param2 = param2;
-    }
-
-    @ExpressionValidator(expression = "(param1 != null) || (param2 != null)",
-            message = "Need param1 or param2.")
-    public String annotatedMethod() {
-        try {
-            // do search
-        } catch (Exception e) {
-            return INPUT;
-        }
-        return SUCCESS;
-    }
-
-    public String notAnnotatedMethod() {
-        try {
-            // do different search
-        } catch (Exception e) {
-            return INPUT;
-        }
-        return SUCCESS;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java
deleted file mode 100644
index 6836cb890..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.opensymphony.xwork2.test.subtest;
-
-import com.opensymphony.xwork2.ModelDrivenAction;
-
-/**
- * Extends ModelDrivenAction to return a null model.
- *
- * @author Mark Woon
- */
-public class NullModelDrivenAction extends ModelDrivenAction {
-
-    /**
-     * @return the model to be pushed onto the ValueStack instead of the Action itself
-     */
-    @Override
-    public Object getModel() {
-        return null;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/Dummy2Class.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/Dummy2Class.java
deleted file mode 100644
index 167b3561e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/Dummy2Class.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.opensymphony.xwork2.util.annotation;
-
-public class Dummy2Class {
-
-    @MyAnnotation("class-test")
-    public void methodWithAnnotation() {
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClass.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClass.java
deleted file mode 100644
index ff33a2a02..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClass.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.opensymphony.xwork2.util.annotation;
-
-@MyAnnotation("class-test")
-public class DummyClass {
-
-    public DummyClass() {
-    }
-
-    @MyAnnotation("method-test")
-    public void methodWithAnnotation() {
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClassExt.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClassExt.java
deleted file mode 100644
index 17c0f894b..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClassExt.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.opensymphony.xwork2.util.annotation;
-
-public final class DummyClassExt extends DummyClass {
-
-    @MyAnnotation2
-    public void anotherAnnotatedMethod() {
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation.java
deleted file mode 100644
index 52092b811..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.opensymphony.xwork2.util.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MyAnnotation {
-
-    String value();
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation2.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation2.java
deleted file mode 100644
index 5564dddac..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.opensymphony.xwork2.util.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MyAnnotation2 {
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/package-info.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/package-info.java
deleted file mode 100644
index 909a70fe9..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/annotation/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * $Id: package-info.java 655902 2008-05-13 15:15:12Z bpontarelli $
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@MyAnnotation("package-test")
-package com.opensymphony.xwork2.util.annotation;
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
deleted file mode 100644
index 0b149c637..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.opensymphony.xwork2.util.fs;
-
-import com.opensymphony.xwork2.FileManager;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Scope;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public class DefaultFileManagerFactoryTest extends XWorkTestCase {
-
-    static FileManager fileManager;
-
-    public void testCreateDefaultFileManager() throws Exception {
-        // given
-        fileManager = null;
-        DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
-        factory.setFileManager(new DefaultFileManager());
-        factory.setContainer(new DummyContainer());
-
-        // when
-        FileManager fm = factory.getFileManager();
-
-        // then
-        assertTrue(fm instanceof DefaultFileManager);
-    }
-
-    public void testCreateDummyFileManager() throws Exception {
-        // given
-        fileManager = new DummyFileManager();
-        DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
-        factory.setFileManager(new DefaultFileManager());
-        factory.setContainer(new DummyContainer());
-
-        // when
-        FileManager fm = factory.getFileManager();
-
-        // then
-        assertTrue(fm instanceof DummyFileManager);
-    }
-
-    public void testFileManagerFactoryWithRealConfig() throws Exception {
-        // given
-        DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
-        container.inject(factory);
-
-        // when
-        FileManager fm = factory.getFileManager();
-
-        // then
-        assertTrue(fm instanceof DefaultFileManager);
-    }
-}
-
-class DummyContainer implements Container {
-    public void inject(Object o) {
-    }
-
-    public <T> T inject(Class<T> implementation) {
-        return null;
-    }
-
-    public <T> T getInstance(Class<T> type, String name) {
-        if ("dummy".equals(name)) {
-            return (T) DefaultFileManagerFactoryTest.fileManager;
-        }
-        return null;
-    }
-
-    public <T> T getInstance(Class<T> type) {
-        return null;
-    }
-
-    public Set<String> getInstanceNames(Class<?> type) {
-        if (DefaultFileManagerFactoryTest.fileManager != null) {
-            return new HashSet<String>() {
-                {
-                    add("dummy");
-                }
-            };
-        }
-        return Collections.emptySet();
-    }
-
-    public void setScopeStrategy(Scope.Strategy scopeStrategy) {
-    }
-
-    public void removeScopeStrategy() {
-    }
-
-}
-
-class DummyFileManager implements FileManager {
-
-    public void setReloadingConfigs(boolean reloadingConfigs) {
-    }
-
-    public boolean fileNeedsReloading(String fileName) {
-        return false;
-    }
-
-    public boolean fileNeedsReloading(URL fileUrl) {
-        return false;
-    }
-
-    public InputStream loadFile(URL fileUrl) {
-        return null;
-    }
-
-    public void monitorFile(URL fileUrl) {
-    }
-
-    public URL normalizeToFileProtocol(URL url) {
-        return null;
-    }
-
-    public boolean support() {
-        return true;
-    }
-
-    public boolean internal() {
-        return true;
-    }
-
-    public Collection<? extends URL> getAllPhysicalUrls(URL url) throws IOException {
-        return null;
-    }
-}
-
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java
deleted file mode 100644
index 416e16c92..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.location;
-
-import junit.framework.TestCase;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.Locator;
-import org.xml.sax.helpers.AttributesImpl;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-public class LocationAttributesTest extends TestCase {
-    
-    public LocationAttributesTest(String name) {
-        super(name);
-    }
-    
-    public void testAddLocationAttributes() throws Exception {
-        AttributesImpl attrs = new AttributesImpl();
-        LocationAttributes.addLocationAttributes(new Locator() {
-            public int getColumnNumber() { return 40; }
-            public int getLineNumber() { return 1; }
-            public String getSystemId() { return "path/to/file.xml"; }
-            public String getPublicId() { return "path/to/file.xml"; }
-        }, attrs);
-
-        assertTrue("path/to/file.xml".equals(attrs.getValue("loc:src")));
-        assertTrue("1".equals(attrs.getValue("loc:line")));
-        assertTrue("40".equals(attrs.getValue("loc:column")));
-    }
- 
-    public void testRecursiveRemove() throws Exception {
-        Document doc = getDoc("xml-with-location.xml");
-
-        Element root = doc.getDocumentElement();
-        LocationAttributes.remove(root, true);
-
-        assertNull(root.getAttributeNode("loc:line"));
-        assertNull(root.getAttributeNode("loc:column"));
-        assertNull(root.getAttributeNode("loc:src"));
-
-        Element kid = (Element)doc.getElementsByTagName("bar").item(0);
-        assertNull(kid.getAttributeNode("loc:line"));
-        assertNull(kid.getAttributeNode("loc:column"));
-        assertNull(kid.getAttributeNode("loc:src"));
-    }    
-
-    public void testNonRecursiveRemove() throws Exception {
-        Document doc = getDoc("xml-with-location.xml");
-
-        Element root = doc.getDocumentElement();
-        LocationAttributes.remove(root, false);
-
-        assertNull(root.getAttributeNode("loc:line"));
-        assertNull(root.getAttributeNode("loc:column"));
-        assertNull(root.getAttributeNode("loc:src"));
-
-        Element kid = (Element)doc.getElementsByTagName("bar").item(0);
-        assertNotNull(kid.getAttributeNode("loc:line"));
-        assertNotNull(kid.getAttributeNode("loc:column"));
-        assertNotNull(kid.getAttributeNode("loc:src"));
-    }    
-
-    private Document getDoc(String path) throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        return builder.parse(LocationAttributesTest.class.getResourceAsStream(path));
-
-
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java
deleted file mode 100644
index 54b4dd407..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.location;
-
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import junit.framework.TestCase;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.URL;
-import java.util.List;
-
-public class LocationImplTest extends TestCase {
-    
-    public LocationImplTest(String name) {
-        super(name);
-    }
-    
-    static final String str = "path/to/file.xml:1:40";
-
-    public void testEquals() throws Exception {
-        Location loc1 = LocationUtils.parse(str);
-        Location loc2 = new LocationImpl(null, "path/to/file.xml", 1, 40);
-        
-        assertEquals("locations", loc1, loc2);
-        assertEquals("hashcode", loc1.hashCode(), loc2.hashCode());
-        assertEquals("string representation", loc1.toString(), loc2.toString());
-    }
-    
-    /**
-     * Test that Location.UNKNOWN is kept identical on deserialization
-     */
-    public void testSerializeUnknown() throws Exception {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(bos);
-        
-        oos.writeObject(Location.UNKNOWN);
-        oos.close();
-        bos.close();
-        
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        ObjectInputStream ois = new ObjectInputStream(bis);
-        
-        Object obj = ois.readObject();
-        
-        assertSame("unknown location", Location.UNKNOWN, obj);
-    }
-    
-    public void testGetSnippet() throws Exception {
-        URL url = ClassLoaderUtil.getResource("com/opensymphony/xwork2/somefile.txt", getClass());
-        Location loc = new LocationImpl("foo", url.toString(), 3, 2);
-        
-        List snippet = loc.getSnippet(1);
-        assertNotNull(snippet);
-        assertTrue("Wrong length: "+snippet.size(), 3 == snippet.size());
-        
-        assertTrue("is".equals(snippet.get(0)));
-        assertTrue("a".equals(snippet.get(1)));
-        assertTrue("file".equals(snippet.get(2)));
-    }
-    
-    public void testGetSnippetNoPadding() throws Exception {
-        URL url = ClassLoaderUtil.getResource("com/opensymphony/xwork2/somefile.txt", getClass());
-        Location loc = new LocationImpl("foo", url.toString(), 3, 2);
-        
-        List snippet = loc.getSnippet(0);
-        assertNotNull(snippet);
-        assertTrue("Wrong length: "+snippet.size(), 1 == snippet.size());
-        
-        assertTrue("a".equals(snippet.get(0)));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java
deleted file mode 100644
index 6a1bcc98e..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.location;
-
-import junit.framework.TestCase;
-
-public class LocationUtilsTest extends TestCase {
-    
-    public LocationUtilsTest(String name) {
-        super(name);
-    }
-    
-    static final String str = "path/to/file.xml:1:40";
-
-    public void testParse() throws Exception {
-        String str = "<map:generate> - path/to/file.xml:1:40";
-        Location loc = LocationUtils.parse(str);
-        
-        assertEquals("<map:generate>", loc.getDescription());
-        assertEquals("URI", "path/to/file.xml", loc.getURI());
-        assertEquals("line", 1, loc.getLineNumber());
-        assertEquals("column", 40, loc.getColumnNumber());
-        assertEquals("string representation", str, loc.toString());
-    }
-    
-    public void testGetLocation_location() throws Exception {
-    		Location loc = new LocationImpl("desc", "sysId", 10, 4);
-    		assertTrue("Location should be the same", 
-				loc == LocationUtils.getLocation(loc, null));
-    }
-    
-    public void testGetLocation_exception() throws Exception {
-    		Exception e = new Exception();
-    		Location loc = LocationUtils.getLocation(e, null);
-    		
-    		assertTrue("Wrong sysId: "+loc.getURI(),
-    				"com/opensymphony/xwork2/util/location/LocationUtilsTest.java"
-    				.equals(loc.getURI()));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java
deleted file mode 100644
index bead369ec..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.opensymphony.xwork2.util.logging;
-
-
-import junit.framework.TestCase;
-
-public class LoggerUtilsTest extends TestCase {
-
-    public void testFormatMessage() {
-        assertEquals("foo", LoggerUtils.format("foo"));
-        assertEquals("foo #", LoggerUtils.format("foo #"));
-        assertEquals("#foo", LoggerUtils.format("#foo"));
-        assertEquals("foo #1", LoggerUtils.format("foo #1"));
-        assertEquals("foo bob", LoggerUtils.format("foo #0", "bob"));
-        assertEquals("foo bob joe", LoggerUtils.format("foo #0 #1", "bob", "joe"));
-        assertEquals("foo bob joe #8", LoggerUtils.format("foo #0 #1 #8", "bob", "joe"));
-        assertEquals("foo (bob/ally)", LoggerUtils.format("foo (#0/#1)", "bob", "ally"));
-        assertEquals("foo (bobally)", LoggerUtils.format("foo (#0#1)", "bob", "ally"));
-
-        assertEquals(null, LoggerUtils.format(null));
-        assertEquals("", LoggerUtils.format(""));
-        
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java
deleted file mode 100644
index 91065658c..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.profiling;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * @author tm_jee
- * @version $Date$ $Id$
- */
-public class ProfilingTimerBeanTest extends TestCase {
-	
-	public void testAddChild() throws Exception {
-		ProfilingTimerBean bean0 = new ProfilingTimerBean("bean0");
-		ProfilingTimerBean bean1 = new ProfilingTimerBean("bean1");
-		ProfilingTimerBean bean2 = new ProfilingTimerBean("bean2");
-		ProfilingTimerBean bean3 = new ProfilingTimerBean("bean3");
-		ProfilingTimerBean bean4 = new ProfilingTimerBean("bean4");
-		ProfilingTimerBean bean5 = new ProfilingTimerBean("bean5");
-		ProfilingTimerBean bean6 = new ProfilingTimerBean("bean6");
-		ProfilingTimerBean bean7 = new ProfilingTimerBean("bean7");
-		ProfilingTimerBean bean8 = new ProfilingTimerBean("bean8");
-		
-		/*  bean0
-		 *    + bean1
-		 *       + bean2
-		 *    + bean3
-		 *       + bean4
-		 *         + bean5
-		 *           + bean6
-		 *       +bean7
-		 *    + bean8
-		 */
-		
-		bean0.addChild(bean1);
-		bean0.addChild(bean3);
-		bean0.addChild(bean8);
-		
-		bean1.addChild(bean2);
-		
-		bean3.addChild(bean4);
-		bean3.addChild(bean7);
-		
-		bean4.addChild(bean5);
-		
-		bean5.addChild(bean6);
-		
-		
-		// bean0
-		assertNull(bean0.getParent());
-		assertEquals(bean0.children.size(), 3);
-		assertTrue(bean0.children.contains(bean1));
-		assertTrue(bean0.children.contains(bean3));
-		assertTrue(bean0.children.contains(bean8));
-		
-		// bean1
-		assertEquals(bean1.getParent(), bean0);
-		assertEquals(bean1.children.size(), 1);
-		assertTrue(bean1.children.contains(bean2));
-		
-		// bean2
-		assertEquals(bean2.getParent(), bean1);
-		assertEquals(bean2.children.size(), 0);
-		
-		// bean3
-		assertEquals(bean3.getParent(), bean0);
-		assertEquals(bean3.children.size(), 2);
-		assertTrue(bean3.children.contains(bean4));
-		assertTrue(bean3.children.contains(bean7));
-		
-		// bean4
-		assertEquals(bean4.getParent(), bean3);
-		assertEquals(bean4.children.size(), 1);
-		assertTrue(bean4.children.contains(bean5));
-		
-		// bean5
-		assertEquals(bean5.getParent(), bean4);
-		assertEquals(bean5.children.size(), 1);
-		assertTrue(bean5.children.contains(bean6));
-		
-		// bean6
-		assertEquals(bean6.getParent(), bean5);
-		assertEquals(bean6.children.size(), 0);
-		
-		// bean7
-		assertEquals(bean7.getParent(), bean3);
-		assertEquals(bean7.children.size(), 0);
-		
-		// bean8
-		assertEquals(bean8.getParent(), bean0);
-		assertEquals(bean8.children.size(), 0);
-	}
-	
-	public void testTime() throws Exception {
-		ProfilingTimerBean bean0 = new ProfilingTimerBean("bean0");
-		bean0.setStartTime();
-		Thread.sleep(1050);
-		bean0.setEndTime();
-		assertTrue(bean0.totalTime >= 1000);
-	}
-	
-	public void testPrint() throws Exception {
-		ProfilingTimerBean bean0 = new ProfilingTimerBean("bean0");
-		bean0.setStartTime();
-		Thread.sleep(1050);
-		bean0.setEndTime();
-		assertEquals(bean0.getPrintable(2000), "");
-		assertTrue(bean0.getPrintable(500).length() > 0);
-	}
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java
deleted file mode 100644
index 1520d7cbd..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.xwork2.util.profiling;
-
-import junit.framework.TestCase;
-
-/**
- * @author tmjee
- * @version $Date$ $Id$
- */
-public class UtilTimerStackTest extends TestCase {
-
-    protected String activateProp;
-    protected String minTimeProp;
-
-
-    public void testActivateInactivate() throws Exception {
-        UtilTimerStack.setActive(true);
-        assertTrue(UtilTimerStack.isActive());
-        UtilTimerStack.setActive(false);
-        assertFalse(UtilTimerStack.isActive());
-    }
-
-
-    public void testPushPop() throws Exception {
-        UtilTimerStack.push("p1");
-        Thread.sleep(1050);
-        ProfilingTimerBean bean = UtilTimerStack.current.get();
-        assertTrue(bean.startTime > 0);
-        UtilTimerStack.pop("p1");
-        assertTrue(bean.totalTime > 1000);
-    }
-
-
-    public void testProfileCallback() throws Exception {
-
-        MockProfilingBlock<String> block = new MockProfilingBlock<String>() {
-            @Override
-            public String performProfiling() throws Exception {
-                Thread.sleep(1050);
-                return "OK";
-            }
-        };
-        String result = UtilTimerStack.profile("p1", block);
-        assertEquals(result, "OK");
-        assertNotNull(block.getProfilingTimerBean());
-        assertTrue(block.getProfilingTimerBean().totalTime >= 1000);
-
-    }
-
-
-    public void testProfileCallbackThrowsException() throws Exception {
-        try {
-            UtilTimerStack.profile("p1",
-                    new UtilTimerStack.ProfilingBlock<String>() {
-                        public String doProfiling() throws Exception {
-                            throw new RuntimeException("test");
-                        }
-                    });
-            fail("exception should have been thrown");
-        }
-        catch (Exception e) {
-            assertTrue(true);
-        }
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        activateProp = System.getProperty(UtilTimerStack.ACTIVATE_PROPERTY);
-        minTimeProp = System.getProperty(UtilTimerStack.MIN_TIME);
-
-        System.setProperty(UtilTimerStack.ACTIVATE_PROPERTY, "true");
-        UtilTimerStack.setActive(true);
-        System.setProperty(UtilTimerStack.MIN_TIME, "0");
-    }
-
-
-    @Override
-    protected void tearDown() throws Exception {
-
-        if (activateProp != null) {
-            System.setProperty(UtilTimerStack.ACTIVATE_PROPERTY, activateProp);
-        } else {
-            System.clearProperty(UtilTimerStack.ACTIVATE_PROPERTY);
-        }
-        if (minTimeProp != null) {
-            System.setProperty(UtilTimerStack.MIN_TIME, minTimeProp);
-        } else {
-            System.clearProperty(UtilTimerStack.ACTIVATE_PROPERTY);
-        }
-
-
-        activateProp = null;
-        minTimeProp = null;
-
-        super.tearDown();
-    }
-
-
-    public abstract class MockProfilingBlock<T> implements UtilTimerStack.ProfilingBlock<T> {
-
-        private ProfilingTimerBean bean;
-
-        public T doProfiling() throws Exception {
-            bean = UtilTimerStack.current.get();
-            return performProfiling();
-        }
-
-        public ProfilingTimerBean getProfilingTimerBean() {
-            return bean;
-        }
-
-        public abstract T performProfiling() throws Exception;
-    }
-}
-
-
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
deleted file mode 100644
index 8ce3fb892..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import java.util.List;
-import java.util.Map;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
-import com.opensymphony.xwork2.validator.VisitorValidatorTestAction;
-import com.opensymphony.xwork2.validator.validators.VisitorFieldValidator.AppendingValidatorContext;
-
-public class AppendingValidatorContextTest extends XWorkTestCase {
-
-    private static final String FIRST_NAME = "first";
-    private static final String SECOND_NAME = "second";
-    private static final String FIELD_NAME = "fieldName";
-    private static final String FULL_FIELD_NAME = FIRST_NAME + "." + SECOND_NAME + "." + FIELD_NAME;
-
-    private VisitorValidatorTestAction action;
-    private VisitorFieldValidator.AppendingValidatorContext validatorContext;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        action = new VisitorValidatorTestAction();
-        ValidatorContext vc1 = new DelegatingValidatorContext(action);
-
-        VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(
-                vc1, "value", FIRST_NAME, "");
-        validatorContext = new AppendingValidatorContext(vc2, "value", SECOND_NAME, "");
-    }
-
-    public void testGetFullFieldName() throws Exception {
-        String fullFieldName = validatorContext.getFullFieldName(FIELD_NAME);
-        assertEquals(FULL_FIELD_NAME, fullFieldName);
-    }
-
-    public void testAddFieldError() throws Exception {
-        validatorContext.addFieldError(FIELD_NAME, "fieldError");
-        assertTrue(action.hasFieldErrors());
-
-        Map<String, List<String>> fieldErrors = action.getFieldErrors();
-        assertEquals(1, fieldErrors.size());
-        assertTrue(fieldErrors.containsKey(FULL_FIELD_NAME));
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
deleted file mode 100644
index 9103169da..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-public class DateRangeFieldValidatorTest extends XWorkTestCase {
-
-    public void testPassValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(createDate(2013, 6, 6));
-        ValidatorContext context = new GenericValidatorContext(action);
-        DateRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 0);
-    }
-
-    public void testMinValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(createDate(2012, Calendar.MARCH, 3));
-        ValidatorContext context = new GenericValidatorContext(action);
-        DateRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 12.12.13, min is 01.01.13 but value is 03.03.12", context.getFieldErrors().get("dateRange").get(0));
-    }
-
-    public void testMaxValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(createDate(2014, Calendar.APRIL, 4));
-        ValidatorContext context = new GenericValidatorContext(action);
-        DateRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 12.12.13, min is 01.01.13 but value is 04.04.14", context.getFieldErrors().get("dateRange").get(0));
-    }
-
-    private ValidationAction prepareAction(Date range) {
-        ValidationAction action = new ValidationAction();
-        action.setDateMinValue(createDate(2013, Calendar.JANUARY, 1));
-        action.setDateMaxValue(createDate(2013, Calendar.DECEMBER, 12));
-        action.setDateRange(range);
-        return action;
-    }
-
-    private Date createDate(int year, int month, int day) {
-        Calendar cal = Calendar.getInstance();
-        cal.set(year, month, day);
-        return cal.getTime();
-    }
-
-    private DateRangeFieldValidator prepareValidator(ValidationAction action, ValidatorContext context) {
-        ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
-        valueStack.push(action);
-
-        DateRangeFieldValidator validator = new DateRangeFieldValidator();
-        validator.setValueStack(valueStack);
-
-        validator.setMaxExpression("${dateMaxValue}");
-        validator.setMinExpression("${dateMinValue}");
-        validator.setValidatorContext(context);
-        validator.setFieldName("dateRange");
-        validator.setDefaultMessage("Max is ${dateMaxValue}, min is ${dateMinValue} but value is ${dateRange}");
-
-        return validator;
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        ActionContext.getContext().setLocale(new Locale("DE"));
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
deleted file mode 100644
index 680ea082a..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
-
-public class IntRangeFieldValidatorTest extends XWorkTestCase {
-
-    public void testPassValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(100);
-        ValidatorContext context = new GenericValidatorContext(action);
-        IntRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 0);
-    }
-
-    public void testMinValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(98);
-        ValidatorContext context = new GenericValidatorContext(action);
-        IntRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 101, min is 99 but value is 98", context.getFieldErrors().get("intRange").get(0));
-    }
-
-    public void testMaxValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(102);
-        ValidatorContext context = new GenericValidatorContext(action);
-        IntRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 101, min is 99 but value is 102", context.getFieldErrors().get("intRange").get(0));
-    }
-
-    private ValidationAction prepareAction(int intRange) {
-        ValidationAction action = new ValidationAction();
-        action.setIntMaxValue(101);
-        action.setIntMinValue(99);
-        action.setIntRange(intRange);
-        return action;
-    }
-
-    private IntRangeFieldValidator prepareValidator(ValidationAction action, ValidatorContext context) {
-        ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
-        valueStack.push(action);
-
-        IntRangeFieldValidator validator = new IntRangeFieldValidator();
-        validator.setValueStack(valueStack);
-
-        validator.setMaxExpression("${intMaxValue}");
-        validator.setMinExpression("${intMinValue}");
-        validator.setValidatorContext(context);
-        validator.setFieldName("intRange");
-        validator.setDefaultMessage("Max is ${intMaxValue}, min is ${intMinValue} but value is ${intRange}");
-
-        return validator;
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
deleted file mode 100644
index e8187d7af..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
-
-public class LongRangeFieldValidatorTest extends XWorkTestCase {
-
-    public void testPassValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(100);
-        ValidatorContext context = new GenericValidatorContext(action);
-        LongRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 0);
-    }
-
-    public void testMinValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(98);
-        ValidatorContext context = new GenericValidatorContext(action);
-        LongRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 101, min is 99 but value is 98", context.getFieldErrors().get("longRange").get(0));
-    }
-
-    public void testMaxValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction(102);
-        ValidatorContext context = new GenericValidatorContext(action);
-        LongRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 101, min is 99 but value is 102", context.getFieldErrors().get("longRange").get(0));
-    }
-
-    private ValidationAction prepareAction(long longRange) {
-        ValidationAction action = new ValidationAction();
-        action.setLongMaxValue(101L);
-        action.setLongMinValue(99L);
-        action.setLongRange(longRange);
-        return action;
-    }
-
-    private LongRangeFieldValidator prepareValidator(ValidationAction action, ValidatorContext context) {
-        ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
-        valueStack.push(action);
-
-        LongRangeFieldValidator validator = new LongRangeFieldValidator();
-        validator.setValueStack(valueStack);
-
-        validator.setMaxExpression("${longMaxValue}");
-        validator.setMinExpression("${longMinValue}");
-        validator.setValidatorContext(context);
-        validator.setFieldName("longRange");
-        validator.setDefaultMessage("Max is ${longMaxValue}, min is ${longMinValue} but value is ${longRange}");
-
-        return validator;
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
deleted file mode 100644
index 2e33a7ffe..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
-
-public class RequiredStringValidatorTest extends XWorkTestCase {
-
-    public void testRequiredStringPass() throws Exception {
-        // given
-        ValueStack valueStack = ActionContext.getContext().getValueStack();
-
-        ValidationAction action = new ValidationAction();
-        action.setStringValue("a string");
-        valueStack.push(action);
-
-        ValidatorContext context = new GenericValidatorContext(action);
-        RequiredStringValidator validator = new RequiredStringValidator();
-        validator.setValidatorContext(context);
-        validator.setFieldName("stringValue");
-        validator.setValueStack(valueStack);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 0);
-    }
-
-    public void testRequiredStringFails() throws Exception {
-        // given
-        ValueStack valueStack = ActionContext.getContext().getValueStack();
-
-        ValidationAction action = new ValidationAction();
-        valueStack.push(action);
-
-        ValidatorContext context = new GenericValidatorContext(action);
-        RequiredStringValidator validator = new RequiredStringValidator();
-        validator.setValidatorContext(context);
-        validator.setFieldName("stringValue");
-        validator.setValueStack(valueStack);
-        validator.setDefaultMessage("Field ${fieldName} is required");
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals(context.getFieldErrors().get("stringValue").get(0), "Field stringValue is required");
-    }
-
-
-    public void testTrimAsExpression() throws Exception {
-        // given
-        ValueStack valueStack = ActionContext.getContext().getValueStack();
-
-        ActionSupport action = new ActionSupport() {
-            public boolean getTrimValue() {
-                return false;
-            }
-        };
-        valueStack.push(action);
-
-        RequiredStringValidator validator = new RequiredStringValidator();
-        validator.setValueStack(valueStack);
-
-        assertTrue(validator.isTrim());
-
-        // when
-        validator.setTrimExpression("${trimValue}");
-
-        // then
-        assertFalse(validator.isTrim());
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
deleted file mode 100644
index 0011ced5a..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
-
-public class ShortRangeFieldValidatorTest extends XWorkTestCase {
-
-    public void testPassValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction((short) 5);
-        ValidatorContext context = new GenericValidatorContext(action);
-        ShortRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 0);
-    }
-
-    public void testMinValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction((short) 1);
-        ValidatorContext context = new GenericValidatorContext(action);
-        ShortRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 10, min is 2 but value is 1", context.getFieldErrors().get("shortRange").get(0));
-    }
-
-    public void testMaxValidation() throws Exception {
-        // given
-        ValidationAction action = prepareAction((short) 11);
-        ValidatorContext context = new GenericValidatorContext(action);
-        ShortRangeFieldValidator validator = prepareValidator(action, context);
-
-        // when
-        validator.validate(action);
-
-        // then
-        assertTrue(context.getFieldErrors().size() == 1);
-        assertEquals("Max is 10, min is 2 but value is 11", context.getFieldErrors().get("shortRange").get(0));
-    }
-
-    private ValidationAction prepareAction(short range) {
-        ValidationAction action = new ValidationAction();
-        action.setShortMaxValue((short) 10);
-        action.setShortMinValue((short) 2);
-        action.setShortRange(range);
-        return action;
-    }
-
-    private ShortRangeFieldValidator prepareValidator(ValidationAction action, ValidatorContext context) {
-        ValueStack valueStack = container.getInstance(ValueStackFactory.class).createValueStack();
-        valueStack.push(action);
-
-        ShortRangeFieldValidator validator = new ShortRangeFieldValidator();
-        validator.setValueStack(valueStack);
-
-        validator.setMaxExpression("${shortMaxValue}");
-        validator.setMinExpression("${shortMinValue}");
-        validator.setValidatorContext(context);
-        validator.setFieldName("shortRange");
-        validator.setDefaultMessage("Max is ${shortMaxValue}, min is ${shortMinValue} but value is ${shortRange}");
-
-        return validator;
-    }
-
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidationAction.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidationAction.java
deleted file mode 100644
index 268288f3b..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidationAction.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.opensymphony.xwork2.validator.validators;
-
-import java.util.Date;
-
-public class ValidationAction {
-
-    private Integer intRange;
-    private Integer intMinValue;
-    private Integer intMaxValue;
-
-    private Short shortRange;
-    private Short shortMinValue;
-    private Short shortMaxValue;
-
-    private Long longRange;
-    private Long longMinValue;
-    private Long longMaxValue;
-
-    private Date dateRange;
-    private Date dateMinValue;
-    private Date dateMaxValue;
-    private String dateFormat;
-    private String stringValue;
-
-    public Integer getIntRange() {
-        return intRange;
-    }
-
-    public void setIntRange(Integer intRange) {
-        this.intRange = intRange;
-    }
-
-    public Integer getIntMinValue() {
-        return intMinValue;
-    }
-
-    public void setIntMinValue(Integer intMinValue) {
-        this.intMinValue = intMinValue;
-    }
-
-    public Integer getIntMaxValue() {
-        return intMaxValue;
-    }
-
-    public void setIntMaxValue(Integer intMaxValue) {
-        this.intMaxValue = intMaxValue;
-    }
-
-    public Short getShortRange() {
-        return shortRange;
-    }
-
-    public void setShortRange(Short shortRange) {
-        this.shortRange = shortRange;
-    }
-
-    public Short getShortMinValue() {
-        return shortMinValue;
-    }
-
-    public void setShortMinValue(Short shortMinValue) {
-        this.shortMinValue = shortMinValue;
-    }
-
-    public Short getShortMaxValue() {
-        return shortMaxValue;
-    }
-
-    public void setShortMaxValue(Short shortMaxValue) {
-        this.shortMaxValue = shortMaxValue;
-    }
-
-    public Long getLongRange() {
-        return longRange;
-    }
-
-    public void setLongRange(Long longRange) {
-        this.longRange = longRange;
-    }
-
-    public Long getLongMinValue() {
-        return longMinValue;
-    }
-
-    public void setLongMinValue(Long longMinValue) {
-        this.longMinValue = longMinValue;
-    }
-
-    public Long getLongMaxValue() {
-        return longMaxValue;
-    }
-
-    public void setLongMaxValue(Long longMaxValue) {
-        this.longMaxValue = longMaxValue;
-    }
-
-    public Date getDateRange() {
-        return dateRange;
-    }
-
-    public void setDateRange(Date dateRange) {
-        this.dateRange = dateRange;
-    }
-
-    public Date getDateMinValue() {
-        return dateMinValue;
-    }
-
-    public void setDateMinValue(Date dateMinValue) {
-        this.dateMinValue = dateMinValue;
-    }
-
-    public Date getDateMaxValue() {
-        return dateMaxValue;
-    }
-
-    public void setDateMaxValue(Date dateMaxValue) {
-        this.dateMaxValue = dateMaxValue;
-    }
-
-    public String getDateFormat() {
-        return dateFormat;
-    }
-
-    public void setDateFormat(String dateFormat) {
-        this.dateFormat = dateFormat;
-    }
-
-    public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-
-    public String getStringValue() {
-        return stringValue;
-    }
-}
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java
deleted file mode 100644
index b2448bc36..000000000
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.opensymphony.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;
-
-/**
- * @author tmjee
- * @version $Date$ $Id$
- */
-public class ValidatorSupportTest extends XWorkTestCase {
-
-	public void testConditionalParseExpression()  throws Exception {
-		ValueStack oldStack = ActionContext.getContext().getValueStack();
-		try {
-			OgnlValueStack stack = (OgnlValueStack) container.getInstance(ValueStackFactory.class).createValueStack();
-			stack.getContext().put(ActionContext.CONTAINER, container);
-			stack.getContext().put("something", "somevalue");
-			ActionContext.getContext().setValueStack(stack);
-			ValidatorSupport validator = new ValidatorSupport() {
-				public void validate(Object object) throws ValidationException {
-				}
-			};
-            validator.setValueStack(ActionContext.getContext().getValueStack());
-
-			String result1 = validator.parse("${#something}", String.class).toString();
-
-			assertEquals(result1, "somevalue");
-		}
-		finally {
-			ActionContext.getContext().setValueStack(oldStack);
-		}
-	}
-
-}
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/ActionSupportTest$MyActionSupport_da.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/ActionSupportTest$MyActionSupport_da.properties
deleted file mode 100644
index 1a4a51b79..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/ActionSupportTest$MyActionSupport_da.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
-hello=Hello World
-hello.0=Hello World {0}
-hello.1=Hello World. This is {0} speaking {1}
-
-format.number = {0,number,#0.0##}
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/AnnotatedTestBean.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/AnnotatedTestBean.properties
deleted file mode 100644
index 577c8e143..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/AnnotatedTestBean.properties
+++ /dev/null
@@ -1 +0,0 @@
-invalid.count=Count must be between ${min} and ${max}, current value is ${count}.
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/DefaultTextProviderTest_en_CA.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/DefaultTextProviderTest_en_CA.properties
deleted file mode 100644
index b01a30fa2..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/DefaultTextProviderTest_en_CA.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
-hello=Hello World
-hello.0=Hello World {0}
-hello.1=Hello World. This is {0} speaking {1}
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml
deleted file mode 100644
index ee6bdc02b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="count">
-        <field-validator type="required">
-            <message>You must enter a value for count.</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">1</param>
-            <param name="max">10</param>
-            <message>count must be between ${min} and ${max}, current value is ${count}.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction.properties
deleted file mode 100644
index cb1555461..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction.properties
+++ /dev/null
@@ -1 +0,0 @@
-invalid.fieldvalue.birth=Invalid date for birth.
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAnnotationAction.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAnnotationAction.properties
deleted file mode 100644
index d92a833df..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAnnotationAction.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
-invalid.fieldvalue.birth=Invalid date for birth.
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml
deleted file mode 100644
index e22d20680..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="baz">
-        <field-validator type="required">
-            <message>You must enter a value for baz.</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">2</param>
-            <param name="max">4</param>
-            <message>baz out of range.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml
deleted file mode 100644
index 849b5acb5..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="bean.name">
-        <field-validator type="required">
-            <message>You must enter a name for the bean.</message>
-        </field-validator>
-    </field>
-    <field name="bean.count">
-        <field-validator type="required">
-            <message>You must have a count for the bean.</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">0</param>
-            <param name="max">10</param>
-            <message>bean.count out of range.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml
deleted file mode 100644
index e1e9e458e..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="bar">
-        <field-validator type="required">
-            <message>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>
-    <field name="percentage">
-        <field-validator type="double">
-            <param name="minExclusive">0.1</param>
-            <param name="maxExclusive">10.1</param>
-            <message>percentage must be between ${minExclusive} and ${maxExclusive}, current value is ${percentage}.</message>
-        </field-validator>
-    </field>
-    <field name="date">
-        <field-validator type="date">
-            <param name="min">12/22/2002</param>
-            <param name="max">12/25/2002</param>
-            <message>The date must be between 12-22-2002 and 12-25-2002.</message>
-        </field-validator>
-    </field>
-    <field name="foo">
-        <field-validator type="int">
-            <param name="min">0</param>
-            <param name="max">100</param>
-            <message key="foo.range">Could not find foo.range!</message>
-        </field-validator>
-    </field>
-    <field name="baz">
-        <field-validator type="int">
-            <param name="min">0</param>
-            <message key="baz.range">Could not find baz.range!</message>
-        </field-validator>
-    </field>
-    <field name="longFoo">
-        <field-validator type="long">
-            <param name="min">0</param>
-            <param name="max">100</param>
-            <message key="foo.range">Could not find foo.range!</message>
-        </field-validator>
-    </field>
-    <field name="shortFoo">
-        <field-validator type="short">
-            <param name="min">0</param>
-            <param name="max">100</param>
-            <message key="foo.range">Could not find foo.range!</message>
-        </field-validator>
-    </field>
-    <validator type="expression">
-        <param name="expression">foo > bar</param>
-        <message>Foo must be greater than Bar. Foo = ${foo}, Bar = ${bar}.</message>
-    </validator>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml
deleted file mode 100644
index e22d20680..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="baz">
-        <field-validator type="required">
-            <message>You must enter a value for baz.</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">2</param>
-            <param name="max">4</param>
-            <message>baz out of range.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction.properties
deleted file mode 100644
index f99b6e736..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-foo.range=Foo Range Message
-baz.range=${getText(fieldName)} must be greater than ${min}
-baz=Baz Field
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction_de.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction_de.properties
deleted file mode 100644
index 62f0bfcf6..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction_de.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo.range=I don''t know German
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction_en.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAction_en.properties
deleted file mode 100644
index e69de29bb..000000000
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction.properties
deleted file mode 100644
index 16819aaf3..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
-foo.range=Foo Range Message
-baz.range=${getText(fieldName)} must be greater than ${min}
-baz=Baz Field
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_de.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_de.properties
deleted file mode 100644
index 773a7fc92..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_de.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
-foo.range=I don''t know German
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_en.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_en.properties
deleted file mode 100644
index 7d0bcf9fe..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_en.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml
deleted file mode 100644
index b1eee9e3d..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="count">
-        <field-validator type="int">
-            <param name="min">1</param>
-            <param name="max">100</param>
-            <message>Count must be between ${min} and ${max}, current value is ${count}.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml
deleted file mode 100644
index 2d2aa4ef0..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="name">
-        <field-validator type="requiredstring" foo="bar">
-            <message>You must enter a name.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml
deleted file mode 100644
index 4e0a3df48..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!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="count">
-        <field-validator type="int" short-circuit="true">
-            <param name="min">1</param>
-            <param name="max">100</param>
-            <message key="invalid.count">Invalid count value, must be between ${min} and ${max}, current value ${count}!</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">20</param>
-            <param name="max">80</param>
-            <message key="invalid.count.bad">Smaller Invalid Count: ${count}</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml
deleted file mode 100644
index 5537544a6..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="name">
-        <field-validator type="fieldexpression">
-            <param name="expression">name.length() > 5</param>
-            <message>Name must be greater than 5 characters, it is currently '${name}'</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml
deleted file mode 100644
index 7a3efc588..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="name">
-        <field-validator type="requiredstring">
-            <message>You must enter a name.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml
deleted file mode 100644
index cdae277b2..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="birth">
-        <field-validator type="date">
-            <param name="min">01/01/1970</param>
-            <message>You must have been born after 1970.</message>
-        </field-validator>
-    </field>
-    <field name="child">
-        <field-validator type="visitor">
-            <message>child bean: </message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml
deleted file mode 100644
index fabf79497..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="birth">
-        <field-validator type="date">
-            <param name="min">01/01/1970</param>
-            <message>You must have been born after 1970.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean.properties
deleted file mode 100644
index 577c8e143..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestBean.properties
+++ /dev/null
@@ -1 +0,0 @@
-invalid.count=Count must be between ${min} and ${max}, current value is ${count}.
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml
deleted file mode 100644
index 93298018c..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!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="requiredstring" short-circuit="true">
-            <message>You must enter a name.</message>
-        </field-validator>
-    <field-validator type="fieldexpression">
-        <param name="expression">name == 'test'</param>
-        <message>Name is invalid</message>
-    </field-validator> 
-    </field>
-    <field name="birth">
-        <field-validator type="date">
-            <param name="min">01/01/1970</param>
-            <message>You must have been born after 1970.</message>
-        </field-validator>
-    </field>
-    <field name="count">
-        <field-validator type="conversion">
-            <message>Count must be an integer.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/TextProviderSupportTest_en.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/TextProviderSupportTest_en.properties
deleted file mode 100644
index a44802b6d..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/TextProviderSupportTest_en.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2002-2006 by OpenSymphony
-# All rights reserved.
-#
-
-hello=Hello World
-hello.0=Hello World {0}
-hello.1=Hello World. This is {0} speaking {1}
-#wrong (unescaped ', {, \): symbols1="=!@#$%^&*(){qwe}<>?:|}{[]\';/.,<>`~'
-symbols1="=!@#$%^&*()'{'qwe}<>?:|}'{'[]\\'';/.,<>`~''
-#wrong: symbols1="=!@#$%^&*()<>?:|[]\';/.,<>`~'
-symbols2="=!@#$%^&*()<>?:|[]\\'';/.,<>`~''
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml
deleted file mode 100644
index 481aa34db..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!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="username">
-		<field-validator type="requiredstring">
-			<message>username required</message>
-		</field-validator>
-	</field>
-
-	<field name="password">
-		<field-validator type="requiredstring">
-			<message>password required</message>
-		</field-validator>
-	</field>
-
-	<field name="confirmPassword">
-		<field-validator type="requiredstring">
-			<message>confirm password required</message>
-		</field-validator>
-		<field-validator type="fieldexpression">
-			<param name="expression">
-                (confirmPassword.equals(password))
-			</param>
-			<message>confirmed password must match password</message>
-		</field-validator>
-	</field>
-	
-	<field name="firstName">
-		<field-validator type="requiredstring">
-			<message>first name required</message>
-		</field-validator>
-	</field>
-	
-	<field name="lastName">
-		<field-validator type="requiredstring">
-			<message>last name required</message>
-		</field-validator>
-	</field>
-
-	<field name="city">
-		<field-validator type="requiredstring">
-			<message>city is required</message>
-		</field-validator>
-	</field>
-	
-	<field name="province">
-		<field-validator type="requiredstring">
-			<message>province is required</message>
-		</field-validator>
-	</field>
-	
-	<field name="country">
-		<field-validator type="requiredstring">
-			<message>country is required</message>
-		</field-validator>
-	</field>
-	
-	<field name="postalCode">
-		<field-validator type="requiredstring">
-			<message>postal code is required</message>
-		</field-validator>
-	</field>
-	
-	<field name="email">
-		<field-validator type="requiredstring">
-			<message>email is required</message>
-		</field-validator>
-		<field-validator type="email">
-			<message>email is invalid</message>
-		</field-validator>
-	</field>
-
-	<field name="website">
-		<field-validator type="requiredstring">
-			<message>website is required</message>
-		</field-validator>
-	</field>
-	
-	<field name="passwordHint">
-		<field-validator type="requiredstring">
-			<message>password hint is required</message>
-		</field-validator>
-	</field>
-</validators>
-
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml
deleted file mode 100644
index c62a21cce..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.1.3//EN"
-    "http://struts.apache.org/dtds/xwork-2.1.3.dtd"
- >
-
-<xwork order="2">
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
deleted file mode 100644
index 4e59b8fbc..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.1.3//EN"
-    "http://struts.apache.org/dtds/xwork-2.1.3.dtd"
- >
-
-<xwork order="3">
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
deleted file mode 100644
index c65721861..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.1.3//EN"
-    "http://struts.apache.org/dtds/xwork-2.1.3.dtd"
- >
-
-<xwork order="1">
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml
deleted file mode 100644
index a8f635e44..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml	
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-            <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-            <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
-            <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
-                <param name="foo">fooDefault</param>
-            </interceptor>
-
-            <interceptor-stack name="defaultStack">
-                <interceptor-ref name="timer"/>
-            </interceptor-stack>
-        </interceptors>
-
-        <global-results>
-            <result name="login"> <!-- should be chain type since it is the default -->
-                <param name="actionName">login</param>
-            </result>
-        </global-results>
-
-        <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">17</param>
-            <param name="bar">23</param>
-            <param name="testXW412">foo.jspa?fooID=${fooID}&amp;something=bar</param>
-            <param name="testXW412Again">
-            		something
-            </param>
-            <param name="testForXW171"></param>
-        </action>
-
-        <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">18</param>
-            <param name="bar">24</param>
-            <result name="success" type="mock" />
-            <interceptor-ref name="defaultStack"/>
-        </action>
-
-        <action name="WildCard" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="*" type="mock" />
-            <interceptor-ref name="defaultStack"/>
-        </action>
-
-        <action name="FooBar" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">18</param>
-            <param name="bar">24</param>
-            <result name="success" type="mock" />
-            <interceptor-ref name="defaultStack"/>
-            <exception-mapping name="runtime" exception="java.lang.RuntimeException" result="exception"/>
-        </action>
-
-        <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="test">
-                <param name="expectedFoo">expectedFooValue</param>
-            </interceptor-ref>
-        </action>
-
-        <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="test">
-                <param name="foo">foo123</param>
-                <param name="expectedFoo">expectedFooValue</param>
-            </interceptor-ref>
-        </action>
-
-        <action name="BarWithoutClassName">
-            <param name="foo">17</param>
-            <param name="bar">23</param>
-        </action>
-
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
deleted file mode 100644
index 39461ec69..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-    <package name="namespace5" extends="namespace4" namespace="/namespace5">
-        <action name="action5" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-        </action>
-    </package>
-
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
deleted file mode 100644
index 8e55e8e28..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-    <package name="namespace4" extends="namespace1" namespace="/namespace4">
-        <interceptors>
-            <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
-        </interceptors>
-
-        <action name="action4" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-        </action>
-    </package>
-
-
-    <include file="com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml" />
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
deleted file mode 100644
index ac30cc264..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-    <package name="namespace2" extends="namespace1" namespace="/namespace2">
-        <action name="action2" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-        </action>
-    </package>
-
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
deleted file mode 100644
index 99bb3b478..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-
-    <package name="namespace1" extends="default" namespace="/namespace1">
-        <interceptors>
-            <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
-        </interceptors>
-
-        <action name="action1" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-        </action>
-    </package>
-
-    <include file="com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml" />
-
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
deleted file mode 100644
index e7f916293..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-default.xml" />
-
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-        </result-types>
-        <interceptors>
-            <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
-        </interceptors>
-    </package>
-
-    <include file="com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml" />
-
-
-    <include file="com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml" />
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
deleted file mode 100644
index dca52f838..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-
-        <action name="Foo" class="com.opensymphony.xwork2.config.providers.PrivateConstructorAction">
-            <param name="foo">13</param>
-        </action>
-
-        <action name="Bar" class="com.opensymphony.xwork2.config.providers.NoNoArgsConstructorAction">
-            <param name="bar">17</param>
-        </action>
-
-        <action name="FooBar" class="com.opensymphony.xwork2.config.providers.IDoNotExistAction">
-            <param name="foobar">17</param>
-        </action>
-
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
deleted file mode 100644
index f0cc446a7..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-    <package name="default">
-
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-            <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-            <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
-            <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
-                <param name="foo">fooDefault</param>
-            </interceptor>
-
-            <interceptor-stack name="defaultStack">
-                <interceptor-ref name="timer"/>
-            </interceptor-stack>
-        </interceptors>
-
-		<default-class-ref class="com.opensymphony.xwork2.UserSpecifiedDefaultAction" />
-
-        <global-results>
-            <result name="login"> <!-- should be chain type since it is the default -->
-                <param name="actionName">login</param>
-            </result>
-        </global-results>
-
-		<!--  No class spcified for action. This should use the default-class-ref -->
-        <action name="Bar">
-            <param name="foo">17</param>
-            <param name="bar">23</param>
-            <param name="testForXW171"></param>
-        </action>
-    </package>
-</xwork>
\ No newline at end of file
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
deleted file mode 100644
index a8f635e44..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-            <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-            <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
-            <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
-                <param name="foo">fooDefault</param>
-            </interceptor>
-
-            <interceptor-stack name="defaultStack">
-                <interceptor-ref name="timer"/>
-            </interceptor-stack>
-        </interceptors>
-
-        <global-results>
-            <result name="login"> <!-- should be chain type since it is the default -->
-                <param name="actionName">login</param>
-            </result>
-        </global-results>
-
-        <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">17</param>
-            <param name="bar">23</param>
-            <param name="testXW412">foo.jspa?fooID=${fooID}&amp;something=bar</param>
-            <param name="testXW412Again">
-            		something
-            </param>
-            <param name="testForXW171"></param>
-        </action>
-
-        <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">18</param>
-            <param name="bar">24</param>
-            <result name="success" type="mock" />
-            <interceptor-ref name="defaultStack"/>
-        </action>
-
-        <action name="WildCard" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="*" type="mock" />
-            <interceptor-ref name="defaultStack"/>
-        </action>
-
-        <action name="FooBar" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">18</param>
-            <param name="bar">24</param>
-            <result name="success" type="mock" />
-            <interceptor-ref name="defaultStack"/>
-            <exception-mapping name="runtime" exception="java.lang.RuntimeException" result="exception"/>
-        </action>
-
-        <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="test">
-                <param name="expectedFoo">expectedFooValue</param>
-            </interceptor-ref>
-        </action>
-
-        <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="test">
-                <param name="foo">foo123</param>
-                <param name="expectedFoo">expectedFooValue</param>
-            </interceptor-ref>
-        </action>
-
-        <action name="BarWithoutClassName">
-            <param name="foo">17</param>
-            <param name="bar">23</param>
-        </action>
-
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
deleted file mode 100644
index 785140834..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.3//EN"
-    "http://struts.apache.org/dtds/xwork-2.3.dtd"
- >
-
-<xwork>
-    <package name="default">
-        <action name="Default">
-        </action>
-
-        <action name="Boring">
-            <allowed-methods> </allowed-methods>
-        </action>
-
-        <action name="Foo">
-            <allowed-methods>foo</allowed-methods>
-        </action>
-
-        <action name="Bar">
-            <allowed-methods>foo,bar</allowed-methods>
-        </action>
-
-        <action name="Baz" method="baz">
-            <allowed-methods>foo,bar</allowed-methods>
-        </action>
-    </package>
-
-    <package name="strict" strict-method-invocation="true">
-        <action name="Default">
-        </action>
-
-        <action name="Boring">
-            <allowed-methods></allowed-methods>
-        </action>
-
-        <action name="Foo">
-            <allowed-methods>foo</allowed-methods>
-        </action>
-
-        <action name="Bar">
-            <allowed-methods>foo,bar</allowed-methods>
-        </action>
-
-        <action name="Baz" method="baz">
-            <allowed-methods>foo,bar</allowed-methods>
-        </action>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
deleted file mode 100644
index 591aa20d4..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default" />
-
-    <package name="badPackage" extends="nonexistentPackage"/>
-
-    <package name="circularPackage" extends="circularPackage"/>
-
-    <package name="anotherCircularPackage" extends="anotherCircularPackage2"/>
-    
-    <package name="anotherCircularPackage2" extends="anotherCircularPackage"/>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
deleted file mode 100644
index 69b5cca94..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default" />
-
-    <package name="namespacepkg" namespace="/namespace/set" />
-
-    <package name="abstractpkg" abstract="true" />
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
deleted file mode 100644
index a403f177b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default" />
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
deleted file mode 100644
index 650cc2b80..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd"
- >
-
-<xwork>
-    <package name="hasDefaultClassRef">
-    	<default-class-ref class="com.opensymphony.xwork2.ActionSupport" />
-    </package>
-    <package name="noDefaultClassRef"/>
-</xwork>
\ No newline at end of file
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
deleted file mode 100644
index f6e27071d..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-            <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-
-        <global-results>
-            <!-- should be chain type since it is the default -->
-            <result name="login">login</result>
-        </global-results>
-
-        <global-exception-mappings>
-            <exception-mapping exception="java.lang.RuntimeException" result="runForDeeHillz"/>
-            <exception-mapping exception="com.opensymphony.xwork2.XworkException" result="xworkNaughty"/>
-        </global-exception-mappings>
-
-        <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
-            <exception-mapping exception="com.opensymphony.xwork2.SpookyException" result="spooky-result"/>
-            <result name="spooky-result" type="mock"/>
-            <result name="specificLocationResult">
-                <param name="actionName">bar.vm</param>
-            </result>
-        </action>
-
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
deleted file mode 100644
index f50d1696d..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-	<package name="parent" namespace="/base">
-		<result-types>
-			<result-type name="mockResult" class="com.opensymphony.xwork2.mock.MockResult" />
-		</result-types>
-		<global-results>
-			<result name="mockResult1" type="mockResult">
-				<param name="identity">p1</param>
-			</result>
-			<result name="mockResult2" type="mockResult">
-				<param name="identity">p2</param>
-			</result>
-		</global-results>
-		<action name="parentAction" />
-	</package>
-
-
-	<package name="another" namespace="/base">
-		<result-types>
-			<result-type name="anotherMockResult" class="com.opensymphony.xwork2.mock.MockResult" />
-		</result-types>
-		<global-results>
-			<result name="mockResult1" type="anotherMockResult">
-				<param name="identity">a1</param>
-			</result>
-			<result name="mockResult2" type="anotherMockResult">
-				<param name="identity">a2</param>
-			</result>
-		</global-results>
-		<action name="anotherAction" />
-	</package>
-
-	<package name="child" extends="parent" namespace="/base">
-		<global-results>
-			<result name="mockResult1" type="mockResult">
-				<param name="identity">c1</param>
-			</result>
-		</global-results>
-		<action name="childAction" />
-	</package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
deleted file mode 100644
index 81481b2db..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-    <!-- this package has a default interceptor ref - so actions with no refs should have the default ref -->
-    <package name="default">
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-            <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
-        </interceptors>
-
-        <default-interceptor-ref name="timer" />
-        <action name="ActionWithOwnRef" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="logging"/>
-        </action>
-        <action name="ActionWithDefaultRef" class="com.opensymphony.xwork2.SimpleAction" />
-    </package>
-
-    <!-- this package has no default interceptor ref - so actions with no refs should inherit the default interceptor -->
-    <!-- this tests that default interceptor refs are inherited -->
-    <package name="subpackage" extends="default">
-        <action name="ActionWithNoRef" class="com.opensymphony.xwork2.SimpleAction" />
-
-        <action name="AnotherActionWithOwnRef" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="logging"/>
-        </action>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
deleted file mode 100644
index 13d50a41f..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-
-            <interceptor-stack name="defaultStack">
-                <interceptor-ref name="timer"/>
-            </interceptor-stack>
-        </interceptors>
-    </package>
-
-    <package name="subPackage" extends="default">
-        <interceptors>
-            <interceptor-stack name="subDefaultStack">
-                <interceptor-ref name="defaultStack"/>
-            </interceptor-stack>
-        </interceptors>
-    </package>
-
-    <package name="subSubPackage" extends="subPackage">
-        <interceptors>
-            <interceptor-stack name="subSubDefaultStack">
-                <interceptor-ref name="defaultStack"/>
-                <interceptor-ref name="subDefaultStack"/>
-            </interceptor-stack>
-        </interceptors>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
deleted file mode 100644
index e0d920b8c..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd">
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-	<package name="packageOne">
-		<result-types>
-			<result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult" />
-		</result-types>
-	
-		<interceptors>
-			<interceptor name="interceptorOne" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-			<interceptor name="interceptorTwo" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-			<interceptor name="interceptorThree" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-			
-			<interceptor-stack name="stackOne">
-				<interceptor-ref name="interceptorOne" />
-				<interceptor-ref name="interceptorTwo" />
-				<interceptor-ref name="interceptorThree" />
-			</interceptor-stack>
-		</interceptors>
-		
-		<action name="actionOne">
-			<interceptor-ref name="stackOne">
-				<param name="interceptorOne.paramOne">i1p1</param>
-				<param name="interceptorOne.paramTwo">i1p2</param>
-				<param name="interceptorTwo.paramOne">i2p1</param>
-			</interceptor-ref>
-			<result name="success" type="mock">test1</result>
-		</action>
-		
-		<action name="actionTwo">
-			<interceptor-ref name="stackOne">
-				<param name="interceptorThree.paramOne">i3p1</param>
-				<param name="interceptorThree.paramTwo">i3p2</param>
-				<param name="interceptorTwo.paramTwo">i2p2</param>
-			</interceptor-ref>
-			<result name="success" type="mock">test2</result>
-		</action>
-	</package>
-</xwork>    
-    
\ No newline at end of file
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
deleted file mode 100644
index 493320ca8..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-        "-//Apache Struts//XWork 1.1.1//EN"
-        "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
-        >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-            <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
-                <param name="foo">fooDefault</param>
-            </interceptor>
-
-            <interceptor-stack name="defaultStack">
-                <interceptor-ref name="timer"/>
-                <interceptor-ref name="test"/>
-            </interceptor-stack>
-        </interceptors>
-
-        <default-interceptor-ref name="defaultStack" />
-
-        <action name="TestInterceptorParam" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="defaultStack">
-                <param name="test.expectedFoo">expectedFooValue</param>
-            </interceptor-ref>
-        </action>
-
-        <action name="TestInterceptorParamOverride" class="com.opensymphony.xwork2.SimpleAction">
-            <interceptor-ref name="defaultStack">
-                <param name="test.foo">foo123</param>
-                <param name="test.expectedFoo">expectedFooValue2</param>
-            </interceptor-ref>
-        </action>
-    </package>
-
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
deleted file mode 100644
index 3ab77c137..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.0//EN"
-    "http://struts.apache.org/dtds/xwork-2.0.dtd">
-
-<xwork>
-	<package name="packageOne">
-		<result-types>
-			<result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult" />
-		</result-types>
-
-		<interceptors>
-			<interceptor name="interceptorOne" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-			<interceptor name="interceptorTwo" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-			<interceptor name="interceptorThree" class="com.opensymphony.xwork2.config.providers.InterceptorForTestPurpose" />
-
-			<interceptor-stack name="stackOne">
-				<interceptor-ref name="interceptorOne" />
-				<interceptor-ref name="interceptorTwo" />
-				<interceptor-ref name="interceptorThree" />
-			</interceptor-stack>
-
-			<interceptor-stack name="stackTwo">
-				<interceptor-ref name="stackOne" />
-			</interceptor-stack>
-
-			<interceptor-stack name="stackThree">
-				<interceptor-ref name="stackTwo" />
-			</interceptor-stack>
-
-		</interceptors>
-
-		<action name="actionOne">
-			<interceptor-ref name="stackTwo">
-				<param name="stackOne.interceptorOne.paramOne">i1p1</param>
-				<param name="stackOne.interceptorOne.paramTwo">i1p2</param>
-				<param name="stackOne.interceptorTwo.paramOne">i2p1</param>
-			</interceptor-ref>
-			<result name="success" type="mock">test1</result>
-		</action>
-
-		<action name="actionTwo">
-			<interceptor-ref name="stackThree">
-				<param name="stackTwo.stackOne.interceptorThree.paramOne">i3p1</param>
-				<param name="stackTwo.stackOne.interceptorThree.paramTwo">i3p2</param>
-				<param name="stackTwo.stackOne.interceptorTwo.paramTwo">i2p2</param>
-			</interceptor-ref>
-			<result name="success" type="mock">test2</result>
-		</action>
-	</package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
deleted file mode 100644
index 41d98c86a..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <interceptors>
-            <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
-            <interceptor name="logging" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
-            <interceptor name="test" class="com.opensymphony.xwork2.mock.MockInterceptor">
-                <param name="foo">expectedFoo</param>
-            </interceptor>
-
-            <interceptor-stack name="defaultStack">
-                <interceptor-ref name="timer"/>
-                <interceptor-ref name="test"/>
-            </interceptor-stack>
-
-            <interceptor-stack name="derivativeStack">
-                <interceptor-ref name="defaultStack"/>
-                <interceptor-ref name="logging"/>
-            </interceptor-stack>
-        </interceptors>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
deleted file mode 100644
index a44dc41a4..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <interceptors>
-            <interceptor name="timer" class="timer-interceptor"/>
-        </interceptors>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml
deleted file mode 100644
index 88310756e..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-        <action name="Foo" class="com.opensymphony.xwork2.SimpleAction">
-            <param name="foo">17</param>
-            <param name="bar">23</param>
-            <result name="success" type="chain">
-                <param name="actionName">Bar</param>
-            </result>
-            <interceptor-ref name="debugStack"/>
-            <interceptor-ref name="defaultStack"/>
-        </action>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
deleted file mode 100644
index 0e270dbc3..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-        </result-types>
-        <interceptors>
-            <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
-        </interceptors>
-    </package>
-
-    <package name="namespace1" extends="default" namespace="/namespace1">
-        <interceptors>
-            <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
-        </interceptors>
-
-        <action name="action1" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-        </action>
-    </package>
-
-
-    <package name="namespace2" extends="namespace1" namespace="/namespace2">
-        <action name="action2" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-        </action>
-    </package>
-
-    <package name="namespace3" extends="namespace2" namespace="/namespace3">
-        <action name="action3" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="success" type="chain"/>
-            <interceptor-ref name="params"/>
-            <interceptor-ref name="staticParams"/>
-        </action>
-    </package>
-
-</xwork>
-
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
deleted file mode 100644
index ef4737a7d..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default" namespace="/default">
-        <action name="default" class="com.opensymphony.xwork2.ActionSupport"/>
-    </package>
-
-    <package name="abstractPackage" abstract="true">
-        <action name="abstract" class="com.opensymphony.xwork2.ActionSupport"/>
-    </package>
-
-    <package name="singleInheritance" namespace="/single" extends="default">
-        <action name="single" class="com.opensymphony.xwork2.ActionSupport"/>
-    </package>
-    
-    <package name="testParentBelow" namespace="/parentBelow" extends="multipleInheritance">
-    	<action name="testParentBelowAction" class="com.opensymphony.xwork2.ActionSupport"/>
-    </package>
-
-    <package name="multipleInheritance" namespace="/multiple" extends="default,abstractPackage,singleInheritance">
-        <action name="multiple" class="com.opensymphony.xwork2.ActionSupport"/>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
deleted file mode 100644
index 25952a44b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true" />
-            <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-    </package>
-
-    <package name="subPackage" extends="default">
-        <result-types>
-            <result-type name="subMock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-
-        <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="chainDefaultTypedResult" />
-            <result name="mockTypedResult" type="mock" />
-            <result name="subMockTypedResult" type="subMock" />
-        </action>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
deleted file mode 100644
index ec226eb95..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xwork PUBLIC 
-	"-//Apache Struts//XWork 1.1.1//EN"
-	"http://struts.apache.org/dtds/xwork-1.1.1.dtd">
- 
-<xwork>
-    <include file="xwork-test-beans.xml" />
-	<package name="xworkResultTypesTestPackage1">
-		<result-types>
-			<result-type name="result1" class="com.opensymphony.xwork2.mock.MockResult" >
-				<param name="param1">value1</param>
-				<param name="param2">value2</param>
-				<param name="param3">value3</param>
-			</result-type>
-			<result-type name="result2" class="com.opensymphony.xwork2.mock.MockResult">
-				<param name="paramA">valueA</param>
-				<param name="paramB">valueB</param>
-			</result-type>
-		</result-types>
-	</package>
-	
-	
-	<package name="xworkResultTypesTestPackage2">
-		<result-types>
-			<result-type name="result1" class="com.opensymphony.xwork2.mock.MockResult" >
-				<param name="param1">value1</param>
-				<param name="param2">value2</param>
-				<param name="param3">value3</param>
-			</result-type>
-			<result-type name="result2" class="com.opensymphony.xwork2.mock.MockResult">
-				<param name="paramA">valueA</param>
-				<param name="paramB">valueB</param>
-			</result-type>
-		</result-types>
-		
-		<action name="action1">
-			<result name="success" type="result1">
-				<param name="param1">newValue1</param>
-				<param name="param3">newValue3</param>
-				<param name="param10">value10</param>
-				<param name="param11">value11</param>
-			</result>
-		</action>
-		
-		<action name="action2">
-			<result name="success" type="result2">
-				<param name="paramB">newValueB</param>
-				<param name="paramZ">valueZ</param>
-			</result>
-		</action>
-	</package>
-	
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
deleted file mode 100644
index 5df61c707..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-	<include file="xwork-test-beans.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
-            <result-type name="mock" class="com.opensymphony.xwork2.mock.MockResult"/>
-        </result-types>
-
-        <global-results>
-            <!-- should be chain type since it is the default -->
-            <result name="login">login</result>
-        </global-results>
-
-        <action name="Bar" class="com.opensymphony.xwork2.SimpleAction">
-            <result name="chainDefaultTypedResult" />
-            <result name="mockTypedResult" type="mock" />
-            <result name="specificLocationResult">
-                <param name="actionName">bar.vm</param>
-            </result>
-            <result name="defaultLocationResult">foo.vm</result>
-            <result name="noDefaultLocationResult"> <!-- this will have only one param, named foo -->
-                foo.vm
-                <param name="foo">bar</param>
-            </result>
-        </action>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
deleted file mode 100644
index e10d2b76e..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-    <package name="default-1" />
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
deleted file mode 100644
index 3039d849b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-    <package name="default-2" />
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
deleted file mode 100644
index d101a40bb..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 1.1.1//EN"
-    "http://struts.apache.org/dtds/xwork-1.1.1.dtd"
- >
-
-<xwork>
-    <include file="xwork-test-beans.xml" />
-    <include file="com/opensymphony/xwork2/config/providers/xwork-test-wildcard-*.xml" />
-    <package name="default-wildcard" />
-</xwork>
\ No newline at end of file
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
deleted file mode 100644
index 614048483..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.1//EN"
-    "http://struts.apache.org/dtds/xwork-2.1.dtd"
- >
-
-<xwork>
-    <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
-    <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
-
-    <unknown-handler-stack>
-    </unknown-handler-stack>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
deleted file mode 100644
index 6b06a4ef7..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE xwork PUBLIC
-    "-//Apache Struts//XWork 2.1//EN"
-    "http://struts.apache.org/dtds/xwork-2.1.dtd"
- >
-
-<xwork>
-    <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
-    <bean type="com.opensymphony.xwork2.UnknownHandler" name="uh2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/>
-
-    <unknown-handler-stack>
-        <unknown-handler-ref name="uh1" />
-        <unknown-handler-ref name="uh2" />
-    </unknown-handler-stack>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties
deleted file mode 100644
index 42fde481b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-xwork-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-com.opensymphony.xwork2.util.Bar=com.opensymphony.xwork2.conversion.impl.FooBarConverter
\ No newline at end of file
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/somefile.txt b/xwork-core/src/test/resources/com/opensymphony/xwork2/somefile.txt
deleted file mode 100644
index 2b9e2512a..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/somefile.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-this
-is
-a
-file
-of
-great
-import
-or
-something
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml
deleted file mode 100644
index 02a4f33e3..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
-          http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="simple-action" class="com.opensymphony.xwork2.SimpleAction" scope="prototype"/>
-
-    <bean id="dependency-action" class="com.opensymphony.xwork2.SimpleAction" scope="prototype">
-        <property name="blah"><value>injected</value></property>
-    </bean>
-
-    <bean id="execute-interceptor" class="com.opensymphony.xwork2.spring.ExecuteInterceptor"/>
-
-    <bean id="proxied-action" class="org.springframework.aop.framework.ProxyFactoryBean">
-        <property name="singleton"><value>false</value></property>  
-		<property name="proxyTargetClass"><value>true</value></property>
-		<property name="interceptorNames">
-			<list>
-				<value>execute-interceptor</value>
-                <!-- When "singleton" is false, the target appears to be required here to 
-                     ensure that the config works as it should -->
-                <value>simple-action</value>
-			</list>
-		</property>
-	</bean>
-
-    <bean id="auto-proxied-action" class="com.opensymphony.xwork2.SimpleAction" scope="prototype"/>
-
-    <bean id="xwork-actions-proxy-creator" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
-		<property name="proxyTargetClass"><value>true</value></property>
-		<property name="interceptorNames">
-			<list>
-				<value>execute-interceptor</value>
-			</list>
-		</property>
-        <property name="beanNames"><value>auto-proxied-action</value></property>
-    </bean>
-    
-    <bean id="springResult" class="com.opensymphony.xwork2.spring.SpringResult" init-method="initialize">
-		<property name="stringParameter" value="my string"/>
-	</bean>
-</beans>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
deleted file mode 100644
index 988956f2e..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//Apache Struts//XWork 2.0//EN" "http://struts.apache.org/dtds/xwork-2.0.dtd">
-<xwork>
-	<bean type="com.opensymphony.xwork2.ObjectFactory" class="com.opensymphony.xwork2.spring.SpringObjectFactory" />
-	<constant name="applicationContextPath" value="com/opensymphony/xwork2/spring/actionContext-spring.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="null" class="com.opensymphony.xwork2.mock.MockResult" default="true"/>
-            <result-type name="springResult" class="springResult" />
-        </result-types>
-
-		<action name="simpleAction" class="simple-action"/>
-
-        <action name="dependencyAction" class="dependency-action"/>
-
-        <action name="proxiedAction" class="proxied-action"/>
-
-        <action name="autoProxiedAction" class="auto-proxied-action"/>
-        
-        <action name="simpleActionSpringResult" class="simple-action">
-			<result name="error" type="springResult"/>
-		</action>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml
deleted file mode 100644
index 059bb4a7f..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-    <bean id="spring-object-factory" class="com.opensymphony.xwork2.spring.SpringObjectFactory" init-method="initObjectFactory"/>
-</beans>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml
deleted file mode 100644
index 6f0908f92..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-	<bean id="myFoo" class="com.opensymphony.xwork2.spring.Foo">
-		<property name="name"><value>Little Foo</value></property>
-	</bean>
-	<bean id="myBar" class="com.opensymphony.xwork2.spring.Bar" autowire="byType">
-		<property name="value"><value>16</value></property>
-	</bean>
-</beans>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml
deleted file mode 100644
index a86ce2088..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//Apache Struts//XWork 2.0//EN" "http://struts.apache.org/dtds/xwork-2.0.dtd">
-<xwork>
-	<bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory" />
-	<bean type="com.opensymphony.xwork2.ObjectFactory" name="default" class="com.opensymphony.xwork2.spring.SpringObjectFactory" />
-	<constant name="applicationContextPath" value="com/opensymphony/xwork2/spring/actionContext-spring.xml" />
-    <package name="default">
-        <result-types>
-            <result-type name="null"
-class="com.opensymphony.xwork2.result.NullResult" default="true"/>
-        </result-types>
-
-        <interceptors>
-            <interceptor name="autowire" class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor">
-              <param name="autowireStrategy">@org.springframework.beans.factory.config.AutowireCapableBeanFactory@AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE</param>
-            </interceptor>
-        </interceptors>
-
-        <default-interceptor-ref name="autowire"/>
-
-       <action name="simpleAction" class="com.opensymphony.xwork2.SimpleAction"/>
-    </package>
-</xwork>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/test.properties
deleted file mode 100644
index 7edc23d67..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test.properties
+++ /dev/null
@@ -1 +0,0 @@
-xwork.error.action.execution=Testing resource bundle override
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties
deleted file mode 100644
index cd84249e0..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-barObj=com.opensymphony.xwork2.conversion.impl.FooBarConverter
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
deleted file mode 100644
index 8bc0a7b3d..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="data">
-        <field-validator type="required">
-            <message>You must enter a value for data.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
deleted file mode 100644
index f32dd3bb0..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="data">
-        <field-validator type="requiredstring">
-            <message>You must enter a value for data.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties
deleted file mode 100644
index 64800c5ff..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-test.foo = Foo!
-test.bar = Bar!
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
deleted file mode 100644
index 054d34fd5..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="bling">
-        <field-validator type="requiredstring">
-            <message>You must enter a value for data.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
deleted file mode 100644
index b59fe1f51..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="horse">
-        <field-validator type="requiredstring">
-            <param name="trim">false</param>
-            <message>noTrim</message>
-        </field-validator>
-        <field-validator type="requiredstring">
-            <param name="trim">true</param>
-            <message>trim</message>
-        </field-validator>
-    </field>
-
-    <field name="cow">
-        <field-validator type="stringlength">
-            <param name="trim">false</param>
-            <param name="minLength">5</param>
-            <message>noTrim-min5</message>
-        </field-validator>
-        <field-validator type="stringlength">
-            <param name="trim">false</param>
-            <param name="minLength">5</param>
-            <param name="maxLength">10</param>
-            <message>noTrim-min5-max10</message>
-        </field-validator>
-        <field-validator type="stringlength">
-            <param name="trim">false</param>
-            <param name="maxLength">10</param>
-            <message>noTrim-max10</message>
-        </field-validator>
-    </field>
-
-    <field name="donkey">
-        <field-validator type="stringlength">
-            <param name="trim">true</param>
-            <param name="minLength">5</param>
-            <message>trim-min5</message>
-        </field-validator>
-        <field-validator type="stringlength">
-            <param name="trim">true</param>
-            <param name="minLength">5</param>
-            <param name="maxLength">10</param>
-            <message>trim-min5-max10</message>
-        </field-validator>
-        <field-validator type="stringlength">
-            <param name="trim">true</param>
-            <param name="maxLength">10</param>
-            <message>trim-max10</message>
-        </field-validator>
-    </field>
-
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
deleted file mode 100644
index a48237f67..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="count">
-        <field-validator type="required">
-            <message>You must enter a value for count.</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">0</param>
-            <param name="max">5</param>
-            <message>count must be between ${min} and ${max}, current value is ${count}.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
deleted file mode 100644
index e22d20680..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
-<validators>
-    <field name="baz">
-        <field-validator type="required">
-            <message>You must enter a value for baz.</message>
-        </field-validator>
-        <field-validator type="int">
-            <param name="min">2</param>
-            <param name="max">4</param>
-            <message>baz out of range.</message>
-        </field-validator>
-    </field>
-</validators>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties
deleted file mode 100644
index 6b1e4df60..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-cat = com.opensymphony.xwork2.conversion.impl.FooBarConverter
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties
deleted file mode 100644
index 171c6106b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/User-conversion.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Collection_list = java.lang.String
-Collection_map = java.lang.String
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
deleted file mode 100644
index afe5d3354..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
deleted file mode 100644
index e96fa5487..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/package.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/test/package.properties
deleted file mode 100644
index 269e24957..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/test/package.properties
+++ /dev/null
@@ -1 +0,0 @@
-package.properties=It works!
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties
deleted file mode 100644
index c60d3e9cf..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Bar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-title=Title:
-invalid.fieldvalue.title=Title is invalid!
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties
deleted file mode 100644
index 7a9efb600..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Collection_kittens = com.opensymphony.xwork2.util.Cat
-foo.number = com.opensymphony.xwork2.conversion.impl.FooNumberConverter
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties
deleted file mode 100644
index 8ee6614fa..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/FindMe.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bean.name=Haha you cant FindMe!
-bean2.name=Okay! You found Me!
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties
deleted file mode 100644
index 09b79ace7..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bar=com.opensymphony.xwork2.conversion.impl.FooBarConverter
-Element_cats=com.opensymphony.xwork2.util.Cat
-Element_moreCats=com.opensymphony.xwork2.util.Cat
-Element_catMap=com.opensymphony.xwork2.util.Cat
-Key_anotherCatMap=java.lang.Long
-Element_anotherCatMap=com.opensymphony.xwork2.util.Cat
-KeyProperty_barCollection=id
-Element_barCollection=com.opensymphony.xwork2.util.Bar
-KeyProperty_barList=id
-Element_barList=com.opensymphony.xwork2.util.Bar
-
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties
deleted file mode 100644
index e7d68394f..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/ListHolder-conversion.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-Element_longs = java.lang.Long
-Element_strings = java.lang.String
-Element_dates = java.util.Date
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties
deleted file mode 100644
index 5bde086ea..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/LocalizedTextUtilTest.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-test.format.date={0,date,short}
-xw377=xw377
-username=Santa
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties
deleted file mode 100644
index b8d68d6ac..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-KeyProperty_beanList=id
-Element_beanList=com.opensymphony.xwork2.util.MyBean
-CreateIfNull_beanList=true
-
-Key_beanMap=java.lang.Long
-KeyProperty_beanMap=id
-Element_beanMap=com.opensymphony.xwork2.util.MyBean
-
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties
deleted file mode 100644
index ebe7be17a..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-Collection_dogs = com.opensymphony.xwork2.util.Dog
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties
deleted file mode 100644
index b1f6327b2..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/XW404_de.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not create a default bundle, XW404 tests a condition where there are no default bundle
-
-hello=Hallo
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties
deleted file mode 100644
index a1766b32e..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/XW404_fr.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not create a default bundle, XW404 tests a condition where there are no default bundle
-
-hello=Bonjour
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml
deleted file mode 100644
index 3e709c87e..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<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>          
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties
deleted file mode 100644
index f365a4ace..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle1.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties
deleted file mode 100644
index d030485d2..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/CompositeTextProviderTestResourceBundle2.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
deleted file mode 100644
index 2b4d8f71b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorModelAction-validation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
deleted file mode 100644
index 69380c685..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
deleted file mode 100644
index be4d34c97..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
deleted file mode 100644
index f83f1018b..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
deleted file mode 100644
index 03dfc5bf3..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
deleted file mode 100644
index 69380c685..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
deleted file mode 100644
index 69380c685..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
deleted file mode 100644
index c9fc4f764..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
deleted file mode 100644
index 9302f2f76..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
deleted file mode 100644
index cf7798ad5..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!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>
-              
-       
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
deleted file mode 100644
index b09037bd2..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
deleted file mode 100644
index 379f216e9..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
deleted file mode 100644
index 3f4bbb61c..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!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>
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
deleted file mode 100644
index 1ecd594b1..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!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>
-
diff --git a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml b/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
deleted file mode 100644
index 890a4a184..000000000
--- a/xwork-core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
-    <validator nameFail="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
-    <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
-    <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
-</validators>
-<!--  END SNIPPET: validators-default -->
diff --git a/xwork-core/src/test/resources/log4j2.xml b/xwork-core/src/test/resources/log4j2.xml
deleted file mode 100644
index 263585ef9..000000000
--- a/xwork-core/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <Appenders>
-        <Console name="STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="STDOUT"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/xwork-core/src/test/resources/validators.xml b/xwork-core/src/test/resources/validators.xml
deleted file mode 100644
index 48369fa5d..000000000
--- a/xwork-core/src/test/resources/validators.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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">
-<validators>
-    <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
-    <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
-    <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
-    <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
-    <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
-</validators>