You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/02 12:25:26 UTC

svn commit: r1209415 [17/19] - in /struts/struts2/branches/STRUTS_3_X: apps/blank/src/main/java/example/ apps/blank/src/test/java/example/ apps/jboss-blank/src/main/java/example/ apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mai...

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java Fri Dec  2 11:24:48 2011
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java Fri Dec  2 11:24:48 2011
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.ActionChainResult;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultConfig;
-import org.apache.struts2.xwork2.interceptor.ParametersInterceptor;
+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;
 
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java Fri Dec  2 11:24:48 2011
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.RuntimeConfiguration;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
+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;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java Fri Dec  2 11:24:48 2011
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.mock.MockResult;
+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;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java Fri Dec  2 11:24:48 2011
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.ActionChainResult;
-import org.apache.struts2.xwork2.SimpleAction;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.mock.MockResult;
+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;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java Fri Dec  2 11:24:48 2011
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.ObjectFactory;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.RuntimeConfiguration;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.impl.MockConfiguration;
-import org.apache.struts2.xwork2.util.ClassLoaderUtil;
-import org.apache.struts2.xwork2.util.FileManager;
+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 com.opensymphony.xwork2.util.FileManager;
 import org.w3c.dom.Document;
 
 import java.io.File;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java Fri Dec  2 11:24:48 2011
@@ -1,10 +1,10 @@
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.UnknownHandlerManager;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.entities.UnknownHandlerConfig;
-import org.apache.struts2.xwork2.DefaultUnknownHandlerManager;
+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;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java Fri Dec  2 11:24:48 2011
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
 
 public class XmlConfigurationProviderWildCardIncludeTest extends ConfigurationTestBase {
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java Fri Dec  2 11:24:48 2011
@@ -1,6 +1,6 @@
-package org.apache.struts2.xwork2.config.providers;
+package com.opensymphony.xwork2.config.providers;
 
-import org.apache.struts2.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.XWorkTestCase;
 import org.easymock.MockControl;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java Fri Dec  2 11:24:48 2011
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.conversion;
+package com.opensymphony.xwork2.conversion;
 
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.conversion.annotations.Conversion;
-import org.apache.struts2.xwork2.conversion.annotations.ConversionRule;
-import org.apache.struts2.xwork2.conversion.annotations.ConversionType;
-import org.apache.struts2.xwork2.conversion.annotations.TypeConversion;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.conversion.annotations.Conversion;
+import com.opensymphony.xwork2.conversion.annotations.ConversionRule;
+import com.opensymphony.xwork2.conversion.annotations.ConversionType;
+import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
 
 import java.util.HashMap;
 import java.util.List;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java Fri Dec  2 11:24:48 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.conversion.impl;
+package com.opensymphony.xwork2.conversion.impl;
 
-import org.apache.struts2.xwork2.util.AnnotatedCat;
-import org.apache.struts2.xwork2.util.Bar;
-import org.apache.struts2.xwork2.util.Cat;
+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;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java Fri Dec  2 11:24:48 2011
@@ -1,4 +1,4 @@
-package org.apache.struts2.xwork2.conversion.impl;
+package com.opensymphony.xwork2.conversion.impl;
 
 import java.util.Map;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.conversion.impl;
+package com.opensymphony.xwork2.conversion.impl;
 
 import junit.framework.TestCase;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java Fri Dec  2 11:24:48 2011
@@ -1,4 +1,4 @@
-package org.apache.struts2.xwork2.conversion.impl;
+package com.opensymphony.xwork2.conversion.impl;
 
 /**
  * <code>ParentClass</code>

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java Fri Dec  2 11:24:48 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.conversion.impl;
+package com.opensymphony.xwork2.conversion.impl;
 
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.XWorkException;
-import org.apache.struts2.xwork2.test.annotations.Person;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.test.annotations.Person;
 import junit.framework.TestCase;
 
 import java.text.DateFormat;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java Fri Dec  2 11:24:48 2011
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.conversion.impl;
+package com.opensymphony.xwork2.conversion.impl;
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.ognl.OgnlValueStack;
-import org.apache.struts2.xwork2.test.ModelDrivenAction2;
-import org.apache.struts2.xwork2.test.User;
-import org.apache.struts2.xwork2.util.Bar;
-import org.apache.struts2.xwork2.util.Cat;
-import org.apache.struts2.xwork2.util.Foo;
-import org.apache.struts2.xwork2.util.FurColor;
-import org.apache.struts2.xwork2.util.reflection.ReflectionContextState;
+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;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java Fri Dec  2 11:24:48 2011
@@ -1,4 +1,4 @@
-package org.apache.struts2.xwork2.inject;
+package com.opensymphony.xwork2.inject;
 
 import junit.framework.TestCase;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.util.ValueStack;
 
 import java.util.*;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.util.ValueStack;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.entities.InterceptorConfig;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.validator.ValidationInterceptor;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.entities.InterceptorConfig;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.validator.ValidationInterceptor;
 
 import java.util.HashMap;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.ExceptionMappingConfig;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.validator.ValidationException;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.validator.ValidationException;
 
 import java.util.HashMap;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.SimpleFooAction;
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.SimpleFooAction;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
 import junit.framework.TestCase;
 
 import java.util.HashMap;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java Fri Dec  2 11:24:48 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.XWorkTestCase;
 
 import java.util.HashSet;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.ConstraintMatcher;
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.util.ValueStack;
 
 import java.util.Date;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.util.ValueStack;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -1,8 +1,8 @@
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionSupport;
 import junit.framework.TestCase;
 import org.easymock.MockControl;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionProxy;
-import org.apache.struts2.xwork2.ModelDrivenAction;
-import org.apache.struts2.xwork2.SimpleAction;
-import org.apache.struts2.xwork2.TestBean;
-import org.apache.struts2.xwork2.TextProvider;
-import org.apache.struts2.xwork2.XWorkTestCase;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
-import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
-import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.ognl.OgnlValueStack;
-import org.apache.struts2.xwork2.ognl.OgnlValueStackFactory;
-import org.apache.struts2.xwork2.ognl.accessor.CompoundRootAccessor;
-import org.apache.struts2.xwork2.util.CompoundRoot;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.ValueStackFactory;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ModelDrivenAction;
+import com.opensymphony.xwork2.SimpleAction;
+import com.opensymphony.xwork2.TestBean;
+import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
+import com.opensymphony.xwork2.ognl.OgnlValueStackFactory;
+import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
+import com.opensymphony.xwork2.util.CompoundRoot;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
 import ognl.PropertyAccessor;
 
 import java.util.ArrayList;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java Fri Dec  2 11:24:48 2011
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.ConfigurationProvider;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.inject.ContainerBuilder;
-import org.apache.struts2.xwork2.util.location.LocatableProperties;
+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.PackageConfig;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
 
 import java.util.HashMap;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java Fri Dec  2 11:24:48 2011
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
 import junit.framework.TestCase;
 import org.easymock.MockControl;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.mock.MockActionProxy;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.mock.MockActionProxy;
 import junit.framework.TestCase;
 import org.easymock.MockControl;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.mock.MockActionProxy;
-import org.apache.struts2.xwork2.test.Equidae;
-import org.apache.struts2.xwork2.test.User;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.mock.MockActionProxy;
+import com.opensymphony.xwork2.test.Equidae;
+import com.opensymphony.xwork2.test.User;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
 import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.SimpleFooAction;
-import org.apache.struts2.xwork2.XWorkTestCase;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.Parameterizable;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.mock.MockActionProxy;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.SimpleFooAction;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.Parameterizable;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.mock.MockActionProxy;
 
 import java.util.Map;
 import java.util.HashMap;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java Fri Dec  2 11:24:48 2011
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.SimpleFooAction;
-import org.apache.struts2.xwork2.XWorkTestCase;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.mock.MockActionProxy;
-import org.apache.struts2.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.SimpleFooAction;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.mock.MockActionProxy;
+import com.opensymphony.xwork2.util.logging.Logger;
 
 /**
  * Unit test for {@link TimerInterceptor}.

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java Fri Dec  2 11:24:48 2011
@@ -13,14 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor;
+package com.opensymphony.xwork2.interceptor;
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.entities.InterceptorConfig;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.validator.ValidationInterceptor;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.entities.InterceptorConfig;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.validator.ValidationInterceptor;
+import org.easymock.MockControl;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
+import org.easymock.IMocksControl;
 
 import java.util.HashMap;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java Fri Dec  2 11:24:48 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.interceptor.annotations;
+package com.opensymphony.xwork2.interceptor.annotations;
 
-import org.apache.struts2.xwork2.Action;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Zsolt Szasz, zsolt at lorecraft dot com

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java Fri Dec  2 11:24:48 2011
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.ognl;
+package com.opensymphony.xwork2.ognl;
 
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.XWorkException;
-import org.apache.struts2.xwork2.XWorkTestCase;
-import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
-import org.apache.struts2.xwork2.interceptor.ChainingInterceptor;
-import org.apache.struts2.xwork2.test.User;
-import org.apache.struts2.xwork2.util.*;
-import org.apache.struts2.xwork2.util.reflection.ReflectionContextState;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.interceptor.ChainingInterceptor;
+import com.opensymphony.xwork2.test.User;
+import com.opensymphony.xwork2.util.*;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
 import ognl.*;
 
 import java.lang.reflect.Method;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java Fri Dec  2 11:24:48 2011
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.ognl;
+package com.opensymphony.xwork2.ognl;
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
-import org.apache.struts2.xwork2.ognl.accessor.CompoundRootAccessor;
-import org.apache.struts2.xwork2.test.TestBean2;
-import org.apache.struts2.xwork2.util.*;
-import org.apache.struts2.xwork2.util.Foo;
-import org.apache.struts2.xwork2.util.reflection.ReflectionContextState;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
+import com.opensymphony.xwork2.test.TestBean2;
+import com.opensymphony.xwork2.util.*;
+import com.opensymphony.xwork2.util.Foo;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
 import ognl.PropertyAccessor;
 
 import java.io.*;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java Fri Dec  2 11:24:48 2011
@@ -17,26 +17,26 @@
  * Created on 6/10/2003
  *
  */
-package org.apache.struts2.xwork2.ognl;
+package com.opensymphony.xwork2.ognl;
 
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.XWorkTestCase;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer;
-import org.apache.struts2.xwork2.conversion.impl.FooBarConverter;
-import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
-import org.apache.struts2.xwork2.inject.ContainerBuilder;
-import org.apache.struts2.xwork2.inject.Context;
-import org.apache.struts2.xwork2.inject.Factory;
-import org.apache.struts2.xwork2.inject.Scope;
-import org.apache.struts2.xwork2.mock.MockObjectTypeDeterminer;
-import org.apache.struts2.xwork2.test.StubConfigurationProvider;
-import org.apache.struts2.xwork2.util.Bar;
-import org.apache.struts2.xwork2.util.Cat;
-import org.apache.struts2.xwork2.util.Foo;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.location.LocatableProperties;
-import org.apache.struts2.xwork2.util.reflection.ReflectionContextState;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
+import com.opensymphony.xwork2.conversion.impl.FooBarConverter;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.inject.Context;
+import com.opensymphony.xwork2.inject.Factory;
+import com.opensymphony.xwork2.inject.Scope;
+import com.opensymphony.xwork2.mock.MockObjectTypeDeterminer;
+import com.opensymphony.xwork2.test.StubConfigurationProvider;
+import com.opensymphony.xwork2.util.Bar;
+import com.opensymphony.xwork2.util.Cat;
+import com.opensymphony.xwork2.util.Foo;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
 import ognl.Ognl;
 
 import java.util.*;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java Fri Dec  2 11:24:48 2011
@@ -1,9 +1,9 @@
 /*
  * Created on Jun 12, 2004
  */
-package org.apache.struts2.xwork2.spring;
+package com.opensymphony.xwork2.spring;
 
-import org.apache.struts2.xwork2.Action;
+import com.opensymphony.xwork2.Action;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/ExternalReferenceAction.java Fri Dec  2 11:24:48 2011
@@ -1,9 +1,9 @@
 /*
  * Created on Nov 11, 2003
  */
-package org.apache.struts2.xwork2.spring;
+package com.opensymphony.xwork2.spring;
 
-import org.apache.struts2.xwork2.Action;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Mike

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Foo.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Foo.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Foo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Foo.java Fri Dec  2 11:24:48 2011
@@ -1,7 +1,7 @@
 /*
  * Created on Nov 11, 2003
  */
-package org.apache.struts2.xwork2.spring;
+package com.opensymphony.xwork2.spring;
 
 /**
  * @author Mike

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java Fri Dec  2 11:24:48 2011
@@ -1,4 +1,4 @@
-package org.apache.struts2.xwork2.spring;
+package com.opensymphony.xwork2.spring;
 
 /*
  * Copyright 2002-2003,2009 The Apache Software Foundation.
@@ -19,26 +19,27 @@ package org.apache.struts2.xwork2.spring
  * Created on Mar 8, 2004
  */
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.InterceptorConfig;
-import org.apache.struts2.xwork2.config.entities.ResultConfig;
-import org.apache.struts2.xwork2.inject.ContainerBuilder;
-import org.apache.struts2.xwork2.interceptor.Interceptor;
-import org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor;
-import org.apache.struts2.xwork2.interceptor.TimerInterceptor;
-import org.apache.struts2.xwork2.test.StubConfigurationProvider;
-import org.apache.struts2.xwork2.util.location.LocatableProperties;
-import org.apache.struts2.xwork2.validator.Validator;
-import org.apache.struts2.xwork2.validator.validators.ExpressionValidator;
-import org.apache.struts2.xwork2.validator.validators.RequiredStringValidator;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor;
+import com.opensymphony.xwork2.interceptor.TimerInterceptor;
+import com.opensymphony.xwork2.test.StubConfigurationProvider;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+import com.opensymphony.xwork2.validator.Validator;
+import com.opensymphony.xwork2.validator.validators.ExpressionValidator;
+import com.opensymphony.xwork2.validator.validators.RequiredStringValidator;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
 import org.springframework.aop.interceptor.DebugInterceptor;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.StaticApplicationContext;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java Fri Dec  2 11:24:48 2011
@@ -1,7 +1,7 @@
-package org.apache.struts2.xwork2.spring;
+package com.opensymphony.xwork2.spring;
 
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.Result;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
 
 public class SpringResult implements Result {
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java Fri Dec  2 11:24:48 2011
@@ -1,11 +1,11 @@
 /*
  * Created on 6/11/2004
  */
-package org.apache.struts2.xwork2.spring.interceptor;
+package com.opensymphony.xwork2.spring.interceptor;
 
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.interceptor.PreResultListener;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
+import com.opensymphony.xwork2.util.ValueStack;
 
 import java.lang.reflect.Method;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware.java Fri Dec  2 11:24:48 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.util.Bar;
+import com.opensymphony.xwork2.util.Bar;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/Equidae.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/Equidae.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/Equidae.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/Equidae.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java Fri Dec  2 11:24:48 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.ModelDrivenAction;
+import com.opensymphony.xwork2.ModelDrivenAction;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java Fri Dec  2 11:24:48 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.ModelDrivenAnnotationAction;
+import com.opensymphony.xwork2.ModelDrivenAnnotationAction;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java Fri Dec  2 11:24:48 2011
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.SimpleAction;
+import com.opensymphony.xwork2.SimpleAction;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java Fri Dec  2 11:24:48 2011
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.SimpleAction;
-import org.apache.struts2.xwork2.util.Bar;
+import com.opensymphony.xwork2.SimpleAction;
+import com.opensymphony.xwork2.util.Bar;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java Fri Dec  2 11:24:48 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.SimpleAnnotationAction;
-import org.apache.struts2.xwork2.validator.annotations.IntRangeFieldValidator;
-import org.apache.struts2.xwork2.validator.annotations.RequiredFieldValidator;
+import com.opensymphony.xwork2.SimpleAnnotationAction;
+import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
 
 /**
  * SimpleAction2

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java Fri Dec  2 11:24:48 2011
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.SimpleAnnotationAction;
-import org.apache.struts2.xwork2.util.Bar;
+import com.opensymphony.xwork2.SimpleAnnotationAction;
+import com.opensymphony.xwork2.util.Bar;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java Fri Dec  2 11:24:48 2011
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
-import org.apache.struts2.xwork2.TestBean;
-import org.apache.struts2.xwork2.util.Bar;
-import org.apache.struts2.xwork2.util.Cat;
+import com.opensymphony.xwork2.TestBean;
+import com.opensymphony.xwork2.util.Bar;
+import com.opensymphony.xwork2.util.Cat;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/User.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/User.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/User.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/User.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
 import java.util.Collection;
 import java.util.List;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.test;
+package com.opensymphony.xwork2.test;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java Fri Dec  2 11:24:48 2011
@@ -1,4 +1,4 @@
-package org.apache.struts2.xwork2.test.annotations;
+package com.opensymphony.xwork2.test.annotations;
 
 public class Person {
 	private String firstName;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java Fri Dec  2 11:24:48 2011
@@ -1,9 +1,9 @@
-package org.apache.struts2.xwork2.test.annotations;
+package com.opensymphony.xwork2.test.annotations;
 
-import org.apache.struts2.xwork2.conversion.annotations.Conversion;
-import org.apache.struts2.xwork2.conversion.annotations.ConversionType;
-import org.apache.struts2.xwork2.conversion.annotations.TypeConversion;
-import org.apache.struts2.xwork2.util.Element;
+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;
 
@@ -18,7 +18,7 @@ import java.util.List;
 public class PersonAction {
 	List<Person> users;
 	private List<Address> address;
-	@Element(org.apache.struts2.xwork2.test.annotations.Address.class)
+	@Element(com.opensymphony.xwork2.test.annotations.Address.class)
 	private List addressesNoGenericElementAnnotation;
 
 	public List<Person> getUsers() {

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java Fri Dec  2 11:24:48 2011
@@ -1,10 +1,10 @@
-package org.apache.struts2.xwork2.test.annotations;
+package com.opensymphony.xwork2.test.annotations;
 
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.XWorkTestCase;
-import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.reflection.ReflectionContextState;
+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;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java Fri Dec  2 11:24:48 2011
@@ -1,6 +1,6 @@
-package org.apache.struts2.xwork2.test.annotations;
+package com.opensymphony.xwork2.test.annotations;
 
-import org.apache.struts2.xwork2.conversion.impl.DefaultTypeConverter;
+import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter;
 
 import java.util.Map;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java Fri Dec  2 11:24:48 2011
@@ -1,8 +1,8 @@
-package org.apache.struts2.xwork2.test.annotations;
+package com.opensymphony.xwork2.test.annotations;
 
-import org.apache.struts2.xwork2.ActionSupport;
-import org.apache.struts2.xwork2.validator.annotations.ExpressionValidator;
-import org.apache.struts2.xwork2.validator.annotations.Validation;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.validator.annotations.ExpressionValidator;
+import com.opensymphony.xwork2.validator.annotations.Validation;
 
 /**
  * <code>ValidateAnnotatedMethodOnlyAction</code>

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java Fri Dec  2 11:24:48 2011
@@ -1,6 +1,6 @@
-package org.apache.struts2.xwork2.test.subtest;
+package com.opensymphony.xwork2.test.subtest;
 
-import org.apache.struts2.xwork2.ModelDrivenAction;
+import com.opensymphony.xwork2.ModelDrivenAction;
 
 /**
  * Extends ModelDrivenAction to return a null model.

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Cat.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Cat.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Cat.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Cat.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.util;
+package com.opensymphony.xwork2.util;
 
 import java.util.List;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.util;
+package com.opensymphony.xwork2.util;
 
 import junit.framework.TestCase;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java Fri Dec  2 11:24:48 2011
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.util;
+package com.opensymphony.xwork2.util;
 
-import org.apache.struts2.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.XWorkTestCase;
 
 import java.util.Vector;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Dog.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Dog.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Dog.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Dog.java Fri Dec  2 11:24:48 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.xwork2.util;
+package com.opensymphony.xwork2.util;
 
 import java.io.Serializable;