You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/01 08:27:13 UTC
svn commit: r1208981 [21/24] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mai...
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/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=1208981&r1=1208980&r2=1208981&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 Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.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=1208981&r1=1208980&r2=1208981&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 Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.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=1208981&r1=1208980&r2=1208981&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 Thu Dec 1 07:18:07 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.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=1208981&r1=1208980&r2=1208981&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 Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.io.Serializable;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.util.location.Location;
+import org.apache.struts2.xwork2.util.location.Location;
import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FileManagerTest.java Thu Dec 1 07:18:07 2011
@@ -1,6 +1,6 @@
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.XWorkTestCase;
import java.io.InputStream;
import java.net.URL;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Foo.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Foo.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Foo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Foo.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FurColor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FurColor.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FurColor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/FurColor.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
public enum FurColor {
BROWN, BLACK, GREEN
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java Thu Dec 1 07:18:07 2011
@@ -4,10 +4,10 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
import java.util.ArrayList;
import java.util.Collection;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Indexed.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Indexed.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Indexed.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Indexed.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.util.Date;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java Thu Dec 1 07:18:07 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.test.ModelDrivenAction2;
-import com.opensymphony.xwork2.test.TestBean2;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.test.ModelDrivenAction2;
+import org.apache.struts2.xwork2.test.TestBean2;
import java.util.Date;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBean.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.io.Serializable;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.util.NamedVariablePatternMatcher.CompiledPattern;
+import org.apache.struts2.xwork2.util.NamedVariablePatternMatcher.CompiledPattern;
import junit.framework.TestCase;
import java.util.Arrays;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Owner.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Owner.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Owner.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Owner.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.spring.SpringObjectFactory;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.spring.SpringObjectFactory;
import junit.framework.TestCase;
import java.net.URL;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Tiger.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Tiger.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Tiger.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Tiger.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/URLUtilTest.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java Thu Dec 1 07:18:07 2011
@@ -1,15 +1,15 @@
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import java.util.List;
-import com.opensymphony.xwork2.UnknownHandler;
-import com.opensymphony.xwork2.UnknownHandlerManager;
-import com.opensymphony.xwork2.UnknownHandlerManagerMock;
-import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.ConfigurationTestBase;
-import com.opensymphony.xwork2.config.providers.SomeUnknownHandler;
+import org.apache.struts2.xwork2.UnknownHandler;
+import org.apache.struts2.xwork2.UnknownHandlerManager;
+import org.apache.struts2.xwork2.UnknownHandlerManagerMock;
+import org.apache.struts2.xwork2.DefaultUnknownHandlerManager;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.ConfigurationTestBase;
+import org.apache.struts2.xwork2.config.providers.SomeUnknownHandler;
/**
* Test UnknownHandlerUtil
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java Thu Dec 1 07:18:07 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.XWorkTestCase;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java Thu Dec 1 07:18:07 2011
@@ -15,12 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.XWorkTestCase;
import java.util.regex.Pattern;
-import java.util.regex.Matcher;
public class WildcardUtilTest extends XWorkTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java Thu Dec 1 07:18:07 2011
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util;
+package org.apache.struts2.xwork2.util;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
import java.util.ArrayList;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util.location;
+package org.apache.struts2.xwork2.util.location;
import junit.framework.TestCase;
import org.w3c.dom.Document;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util.location;
+package org.apache.struts2.xwork2.util.location;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
import junit.framework.TestCase;
import java.io.ByteArrayInputStream;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util.location;
+package org.apache.struts2.xwork2.util.location;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/logging/LoggerUtilsTest.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2.util.logging;
+package org.apache.struts2.xwork2.util.logging;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util.profiling;
+package org.apache.struts2.xwork2.util.profiling;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.util.profiling;
+package org.apache.struts2.xwork2.util.profiling;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.ValidationAwareSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.ValidationAwareSupport;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.ConversionErrorFieldValidator;
import java.util.HashMap;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.validator.validators.DateRangeFieldValidator;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java Thu Dec 1 07:18:07 2011
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.test.DataAware2;
-import com.opensymphony.xwork2.test.SimpleAction2;
-import com.opensymphony.xwork2.test.SimpleAction3;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.test.DataAware2;
+import org.apache.struts2.xwork2.test.SimpleAction2;
+import org.apache.struts2.xwork2.test.SimpleAction3;
+import org.apache.struts2.xwork2.util.ValueStack;
import junit.framework.TestCase;
import java.util.ArrayList;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java Thu Dec 1 07:18:07 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.XWorkException;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.validator.validators.*;
+import org.apache.struts2.xwork2.XWorkException;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.validator.validators.*;
import junit.framework.TestCase;
import java.io.InputStream;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -1,10 +1,10 @@
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.DoubleRangeFieldValidator;
import java.util.Iterator;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.validator.validators.EmailValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.validator.validators.EmailValidator;
/**
* Test case for Email Validator
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.validator.validators.ExpressionValidator;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.validator.validators.ExpressionValidator;
import java.util.Collection;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.RegexFieldValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.RegexFieldValidator;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.RepopulateConversionErrorFieldValidatorSupport;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.RepopulateConversionErrorFieldValidatorSupport;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java Thu Dec 1 07:18:07 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.ValidatorSupport;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.validator.validators.StringLengthFieldValidator;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.test.Equidae;
-import com.opensymphony.xwork2.validator.validators.RequiredStringValidator;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.test.Equidae;
+import org.apache.struts2.xwork2.validator.validators.RequiredStringValidator;
import java.util.List;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.validators.URLValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.validators.URLValidator;
/**
* Test case for URLValidator
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java Thu Dec 1 07:18:07 2011
@@ -1,10 +1,10 @@
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.Collection;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java Thu Dec 1 07:18:07 2011
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.test.TestBean2;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.test.TestBean2;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java Thu Dec 1 07:18:07 2011
@@ -13,16 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
import java.util.*;
import org.easymock.EasyMock;
-import org.easymock.IAnswer;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.ModelDriven;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.xwork2.validator;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.TestBean;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.TestBean;
import java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.ognl.OgnlValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.ognl.OgnlValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
* @author tmjee
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ChainResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ChainResultTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ChainResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ChainResultTest.java Thu Dec 1 07:18:07 2011
@@ -19,11 +19,11 @@
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
import junit.framework.TestCase;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/CompositeTextProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/CompositeTextProviderTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/CompositeTextProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/CompositeTextProviderTest.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.ArrayList;
import java.util.Locale;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultActionInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultActionInvocationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultActionInvocationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultActionInvocationTest.java Thu Dec 1 07:18:07 2011
@@ -1,8 +1,8 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.mock.MockActionProxy;
-import com.opensymphony.xwork2.mock.MockInterceptor;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.mock.MockActionProxy;
+import org.apache.struts2.xwork2.mock.MockInterceptor;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultClasstTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultClasstTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultClasstTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultClasstTest.java Thu Dec 1 07:18:07 2011
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
/**
* <code>WildCardResultTest</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultTextProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultTextProviderTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultTextProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/DefaultTextProviderTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
import junit.framework.TestCase;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ExternalReferenceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ExternalReferenceAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ExternalReferenceAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ExternalReferenceAction.java Thu Dec 1 07:18:07 2011
@@ -19,7 +19,7 @@
* To change the template for this generated file go to Window - Preferences -
* Java - Code Generation - Code and Comments
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/Foo.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/Foo.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/Foo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/Foo.java Thu Dec 1 07:18:07 2011
@@ -19,7 +19,7 @@
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/GenericsBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/GenericsBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/GenericsBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/GenericsBean.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/LocaleAwareTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/LocaleAwareTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/LocaleAwareTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/LocaleAwareTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
import java.util.Locale;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAnnotationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAnnotationAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAnnotationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ModelDrivenAnnotationAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* ModelDrivenAnnotationAction
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/NestedAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/NestedAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/NestedAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/NestedAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import junit.framework.Assert;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationAction.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* Need by the ProxyInvocationTest
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationInterface.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationInterface.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationInterface.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationInterface.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* Need by the ProxyInvocationTest
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyInvocationTest.java Thu Dec 1 07:18:07 2011
@@ -1,6 +1,6 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyObjectFactory.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ProxyObjectFactory.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAction.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.inject.Inject;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAnnotationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAnnotationAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAnnotationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleAnnotationAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.validator.annotations.*;
+import org.apache.struts2.xwork2.validator.annotations.*;
import java.util.ArrayList;
import java.util.Date;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleFooAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleFooAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleFooAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/SimpleFooAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/StubValueStack.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/StubValueStack.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/StubValueStack.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/StubValueStack.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.CompoundRoot;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.CompoundRoot;
+import org.apache.struts2.xwork2.util.ValueStack;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestBean.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.Date;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestChildBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestChildBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestChildBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/TestChildBean.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.Calendar;
import java.util.Date;