Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationValidationConfigurationBuilder.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationValidationConfigurationBuilder.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationValidationConfigurationBuilder.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationValidationConfigurationBuilder.java Wed Nov 30 19:49:40 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.validator.annotations.*; +import org.apache.struts2.xwork2.validator.annotations.*; import java.lang.annotation.Annotation; import java.lang.reflect.Method;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ActionSupportTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ActionSupportTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ActionSupportTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ActionSupportTest.java Wed Nov 30 19:49:40 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 java.util.ArrayList; import java.util.HashMap; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/AnnotatedTestBean.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/AnnotatedTestBean.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/AnnotatedTestBean.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/AnnotatedTestBean.java Wed Nov 30 19:49:40 2011 @@ -13,11 +13,11 @@ * 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.IntRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator; -import com.opensymphony.xwork2.validator.annotations.Validations; +import org.apache.struts2.xwork2.validator.annotations.IntRangeFieldValidator; +import org.apache.struts2.xwork2.validator.annotations.RequiredStringValidator; +import org.apache.struts2.xwork2.validator.annotations.Validations; import java.util.Date; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverterTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverterTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverterTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverterTest.java Wed Nov 30 19:49:40 2011 @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.xwork2.conversion.impl; -import com.opensymphony.xwork2.*; -import com.opensymphony.xwork2.test.AnnotationUser; -import com.opensymphony.xwork2.test.ModelDrivenAnnotationAction2; -import com.opensymphony.xwork2.util.Bar; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.xwork2.*; +import org.apache.struts2.xwork2.test.AnnotationUser; +import org.apache.struts2.xwork2.test.ModelDrivenAnnotationAction2; +import org.apache.struts2.xwork2.util.Bar; +import org.apache.struts2.xwork2.util.ValueStack; +import org.apache.struts2.xwork2.util.reflection.ReflectionContextState; import ognl.OgnlException; import ognl.OgnlRuntime; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/AliasInterceptorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/AliasInterceptorTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/AliasInterceptorTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/AliasInterceptorTest.java Wed Nov 30 19:49:40 2011 @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.xwork2.interceptor; -import com.opensymphony.xwork2.*; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import com.opensymphony.xwork2.mock.MockActionInvocation; -import com.opensymphony.xwork2.mock.MockActionProxy; +import org.apache.struts2.xwork2.*; +import org.apache.struts2.xwork2.config.entities.ActionConfig; +import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider; +import org.apache.struts2.xwork2.mock.MockActionInvocation; +import org.apache.struts2.xwork2.mock.MockActionProxy; import java.util.HashMap; import java.util.Map; @@ -32,7 +32,7 @@ import java.util.Map; * stack.getContext().putAll(params); * <p/> * e.g. - * <action name="aliasTest" class="com.opensymphony.xwork2.SimpleAction"> + * <action name="aliasTest" class="org.apache.struts2.xwork2.SimpleAction"> * <param name="aliases">#{ "aliasSource" : "aliasDest", "bar":"baz" }</param> * <interceptor-ref name="defaultStack"/> * <interceptor-ref name="alias"/> Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultAction.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultAction.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultAction.java Wed Nov 30 19:49:40 2011 @@ -1,6 +1,6 @@ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.xwork2.ActionSupport; /** * @author martin.gilday Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultModel.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultModel.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultModel.java Wed Nov 30 19:49:40 2011 @@ -1,6 +1,4 @@ -package com.opensymphony.xwork2.interceptor.annotations; - -import com.opensymphony.xwork2.ActionSupport; +package org.apache.struts2.xwork2.interceptor.annotations; /** * @author jafl Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotatedAction.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotatedAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotatedAction.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotatedAction.java Wed Nov 30 19:49:40 2011 @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.xwork2.Action; /** * @author Zsolt Szasz, zsolt at lorecraft dot com Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java Wed Nov 30 19:49:40 2011 @@ -1,11 +1,11 @@ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; import com.mockobjects.dynamic.Mock; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.StubValueStack; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.xwork2.Action; +import org.apache.struts2.xwork2.ActionContext; +import org.apache.struts2.xwork2.ActionInvocation; +import org.apache.struts2.xwork2.StubValueStack; +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/interceptor/annotations/AnnotationWorkflowInterceptorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java Wed Nov 30 19:49:40 2011 @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; -import com.opensymphony.xwork2.*; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.mock.MockResult; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import 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.InterceptorMapping; +import org.apache.struts2.xwork2.config.entities.PackageConfig; +import org.apache.struts2.xwork2.config.entities.ResultConfig; +import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider; +import org.apache.struts2.xwork2.inject.ContainerBuilder; +import org.apache.struts2.xwork2.mock.MockResult; +import org.apache.struts2.xwork2.util.location.LocatableProperties; import java.util.Arrays; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BaseAnnotatedAction.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BaseAnnotatedAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BaseAnnotatedAction.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BaseAnnotatedAction.java Wed Nov 30 19:49:40 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; /** * @author Zsolt Szasz, zsolt at lorecraft dot com Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultAction.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultAction.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultAction.java Wed Nov 30 19:49:40 2011 @@ -1,6 +1,6 @@ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.xwork2.ActionSupport; /** * @author martin.gilday Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultModel.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultModel.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultModel.java Wed Nov 30 19:49:40 2011 @@ -1,4 +1,4 @@ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.xwork2.interceptor.annotations; /** * @author jafl Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/spring/Bar.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/spring/Bar.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/spring/Bar.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/spring/Bar.java Wed Nov 30 19:49:40 2011 @@ -1,7 +1,7 @@ /* * Created on Nov 12, 2003 */ -package com.opensymphony.xwork2.spring; +package org.apache.struts2.xwork2.spring; /** * @author Mike Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware.java Wed Nov 30 19:49:40 2011 @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.test; +package org.apache.struts2.xwork2.test; -import com.opensymphony.xwork2.conversion.annotations.Conversion; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; -import com.opensymphony.xwork2.util.Bar; -import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator; -import com.opensymphony.xwork2.validator.annotations.Validation; +import org.apache.struts2.xwork2.conversion.annotations.Conversion; +import org.apache.struts2.xwork2.conversion.annotations.TypeConversion; +import org.apache.struts2.xwork2.util.Bar; +import org.apache.struts2.xwork2.validator.annotations.RequiredFieldValidator; +import org.apache.struts2.xwork2.validator.annotations.RequiredStringValidator; +import org.apache.struts2.xwork2.validator.annotations.Validation; /** @@ -36,7 +36,7 @@ public interface AnnotationDataAware { void setBarObj(Bar b); @TypeConversion( - converter = "com.opensymphony.xwork2.conversion.impl.FooBarConverter" + converter = "org.apache.struts2.xwork2.conversion.impl.FooBarConverter" ) Bar getBarObj(); Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware2.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware2.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware2.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware2.java Wed Nov 30 19:49:40 2011 @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.test; +package org.apache.struts2.xwork2.test; -import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator; +import org.apache.struts2.xwork2.validator.annotations.RequiredStringValidator; /** Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationTestBean2.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationTestBean2.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationTestBean2.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationTestBean2.java Wed Nov 30 19:49:40 2011 @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.test; +package org.apache.struts2.xwork2.test; -import com.opensymphony.xwork2.AnnotatedTestBean; -import com.opensymphony.xwork2.conversion.annotations.Conversion; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; -import com.opensymphony.xwork2.util.Bar; -import com.opensymphony.xwork2.util.Cat; +import org.apache.struts2.xwork2.AnnotatedTestBean; +import org.apache.struts2.xwork2.conversion.annotations.Conversion; +import org.apache.struts2.xwork2.conversion.annotations.TypeConversion; +import org.apache.struts2.xwork2.util.Bar; +import org.apache.struts2.xwork2.util.Cat; /** @@ -57,7 +57,7 @@ public class AnnotationTestBean2 extends } @TypeConversion( - key = "cat", converter = "com.opensymphony.xwork2.conversion.impl.FooBarConverter" + key = "cat", converter = "org.apache.struts2.xwork2.conversion.impl.FooBarConverter" ) public void setCat(Cat cat) { this.cat = cat; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUser.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUser.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUser.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUser.java Wed Nov 30 19:49:40 2011 @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.test; +package org.apache.struts2.xwork2.test; -import com.opensymphony.xwork2.conversion.annotations.ConversionRule; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; -import com.opensymphony.xwork2.util.KeyProperty; -import com.opensymphony.xwork2.validator.annotations.*; +import org.apache.struts2.xwork2.conversion.annotations.ConversionRule; +import org.apache.struts2.xwork2.conversion.annotations.TypeConversion; +import org.apache.struts2.xwork2.util.KeyProperty; +import org.apache.struts2.xwork2.validator.annotations.*; import java.util.Collection; import java.util.List; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUserMarker.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUserMarker.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUserMarker.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUserMarker.java Wed Nov 30 19:49:40 2011 @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.test; +package org.apache.struts2.xwork2.test; -import com.opensymphony.xwork2.validator.annotations.ExpressionValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator; -import com.opensymphony.xwork2.validator.annotations.Validation; -import com.opensymphony.xwork2.validator.annotations.Validations; +import org.apache.struts2.xwork2.validator.annotations.ExpressionValidator; +import org.apache.struts2.xwork2.validator.annotations.RequiredFieldValidator; +import org.apache.struts2.xwork2.validator.annotations.Validation; +import org.apache.struts2.xwork2.validator.annotations.Validations; /** * Marker interface to help test hierarchy traversal. Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/Address.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/Address.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/Address.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/Address.java Wed Nov 30 19:49:40 2011 @@ -1,4 +1,4 @@ -package com.opensymphony.xwork2.test.annotations; +package org.apache.struts2.xwork2.test.annotations; public class Address { private String line1; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/AddressTypeConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/AddressTypeConverter.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/AddressTypeConverter.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/AddressTypeConverter.java Wed Nov 30 19:49:40 2011 @@ -1,6 +1,6 @@ -package com.opensymphony.xwork2.test.annotations; +package org.apache.struts2.xwork2.test.annotations; -import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter; +import org.apache.struts2.xwork2.conversion.impl.DefaultTypeConverter; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotatedCat.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotatedCat.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotatedCat.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotatedCat.java Wed Nov 30 19:49:40 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.conversion.annotations.Conversion; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; +import org.apache.struts2.xwork2.conversion.annotations.Conversion; +import org.apache.struts2.xwork2.conversion.annotations.TypeConversion; import java.util.List; @@ -51,7 +51,7 @@ public class AnnotatedCat { } @TypeConversion( - key = "kittens", converter = "com.opensymphony.xwork2.util.Cat" + key = "kittens", converter = "org.apache.struts2.xwork2.util.Cat" ) public List getKittens() { return kittens; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotationUtilsTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotationUtilsTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotationUtilsTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotationUtilsTest.java Wed Nov 30 19:49:40 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/org/apache/struts2/xwork2/util/Bar.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/Bar.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/Bar.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/Bar.java Wed Nov 30 19:49:40 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.ActionSupport; +import org.apache.struts2.xwork2.ActionSupport; /** Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/BarJunior.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/BarJunior.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/BarJunior.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/BarJunior.java Wed Nov 30 19:49:40 2011 @@ -1,4 +1,4 @@ -package com.opensymphony.xwork2.util; +package org.apache.struts2.xwork2.util; public class BarJunior extends Bar { } Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ActionValidatorManagerTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ActionValidatorManagerTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ActionValidatorManagerTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ActionValidatorManagerTest.java Wed Nov 30 19:49:40 2011 @@ -1,12 +1,12 @@ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.xwork2.validator; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.XWorkTestCase; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator; -import com.opensymphony.xwork2.validator.validators.RequiredStringValidator; -import com.opensymphony.xwork2.validator.validators.VisitorFieldValidator; +import org.apache.struts2.xwork2.ActionSupport; +import org.apache.struts2.xwork2.XWorkTestCase; +import org.apache.struts2.xwork2.util.ValueStack; +import org.apache.struts2.xwork2.util.ValueStackFactory; +import org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator; +import org.apache.struts2.xwork2.validator.validators.RequiredStringValidator; +import org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator; import java.util.ArrayList; import java.util.Collections; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManagerTest.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManagerTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManagerTest.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManagerTest.java Wed Nov 30 19:49:40 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.opensymphony.xwork2.*; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.test.AnnotationDataAware2; -import com.opensymphony.xwork2.test.AnnotationUser; -import com.opensymphony.xwork2.test.SimpleAnnotationAction2; -import com.opensymphony.xwork2.test.SimpleAnnotationAction3; -import com.opensymphony.xwork2.util.FileManager; -import com.opensymphony.xwork2.validator.validators.*; +import org.apache.struts2.xwork2.*; +import org.apache.struts2.xwork2.config.entities.ActionConfig; +import org.apache.struts2.xwork2.test.AnnotationDataAware2; +import org.apache.struts2.xwork2.test.AnnotationUser; +import org.apache.struts2.xwork2.test.SimpleAnnotationAction2; +import org.apache.struts2.xwork2.test.SimpleAnnotationAction3; +import org.apache.struts2.xwork2.util.FileManager; +import org.apache.struts2.xwork2.validator.validators.*; import org.easymock.EasyMock; import java.util.List;
