struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r1208734 [1/2] - in /struts/struts2/branches/STRUTS_3_X: apps/mailreader/src/main/java/mailreader2/ apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/ apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/ apps/showc...
Date Wed, 30 Nov 2011 19:50:20 GMT
Author: lukaszlenart
Date: Wed Nov 30 19:49:40 2011
New Revision: 1208734

URL: http://svn.apache.org/viewvc?rev=1208734&view=rev
Log:
WW-3714 renames org.opensymphony.xwork2 to org.apache.struts2.xwork2 - part 2

Removed:
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverter.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/util/ArrayUtils.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/AnnotatedTestBean.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultModel.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotatedAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BaseAnnotatedAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultModel.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/spring/Bar.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware2.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationTestBean2.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationUser.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/AnnotationUserMarker.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/Address.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/test/annotations/AddressTypeConverter.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotatedCat.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/Bar.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/util/BarJunior.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/ActionValidatorManagerTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
Modified:
    struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
    struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
    struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
    struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java
    struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
    struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
    struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
    struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
    struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
    struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java
    struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
    struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
    struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
    struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java
    struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleClassLoaderInterface.java
    struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/ActionSupport.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverter.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/AliasInterceptor.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/After.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Allowed.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Before.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BeforeResult.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BlockByDefault.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Blocked.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/AnnotationUtils.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/ArrayUtils.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/ActionValidatorManager.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManager.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationValidationConfigurationBuilder.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/ActionSupportTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/AnnotatedTestBean.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/AliasInterceptorTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AllowingByDefaultModel.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotatedAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterUnitTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BaseAnnotatedAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultAction.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/interceptor/annotations/BlockingByDefaultModel.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/spring/Bar.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationDataAware2.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationTestBean2.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUser.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/AnnotationUserMarker.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/Address.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/test/annotations/AddressTypeConverter.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotatedCat.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/AnnotationUtilsTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/Bar.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/util/BarJunior.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/ActionValidatorManagerTest.java
    struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManagerTest.java

Modified: struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java Wed Nov 30 19:49:40 2011
@@ -33,8 +33,8 @@ import javax.servlet.ServletContextListe
 
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
 
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 /**
  * <p><code>ServletContextListener</code> that initializes and finalizes the

Modified: struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java Wed Nov 30 19:49:40 2011
@@ -20,9 +20,9 @@
  */
 package mailreader2;
 
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Action;
 import java.util.Map;
 import org.apache.struts.apps.mailreader.dao.User;
 

Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java Wed Nov 30 19:49:40 2011
@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
 
 import java.io.Serializable;
 

Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java Wed Nov 30 19:49:40 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.ajax
 import java.util.ArrayList;
 import java.util.List;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
 
 public class AutocompleterExampleAction extends ActionSupport {
   private String select;

Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java Wed Nov 30 19:49:40 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.conv
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
 
 /**
  * @version $Date$ $Id$

Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java Wed Nov 30 19:49:40 2011
@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.tag.nonui.actiontag;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java Wed Nov 30 19:49:40 2011
@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Validateable;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Validateable;
 
 /**
  *

Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt Wed Nov 30 19:49:40 2011
@@ -20,7 +20,7 @@ package org.apache.struts2.showcase.conv
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
 
 /**
  * @version $Date$ $Id$

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java Wed Nov 30 19:49:40 2011
@@ -21,10 +21,10 @@
 
 package org.apache.struts2.components;
 
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java Wed Nov 30 19:49:40 2011
@@ -32,9 +32,9 @@ import org.apache.struts2.util.MakeItera
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 /**
  * <!-- START SNIPPET: javadoc -->

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java Wed Nov 30 19:49:40 2011
@@ -26,13 +26,13 @@ import java.io.Writer;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
 
 /**
  * <!-- START SNIPPET: javadoc -->

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java Wed Nov 30 19:49:40 2011
@@ -21,9 +21,9 @@
 
 package org.apache.struts2.components.template;
 
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Wed Nov 30 19:49:40 2011
@@ -32,27 +32,27 @@ import org.apache.struts2.dispatcher.mul
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.velocity.VelocityManager;
 
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.UnknownHandlerManager;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Context;
-import com.opensymphony.xwork2.inject.Factory;
-import com.opensymphony.xwork2.inject.Scope;
-import com.opensymphony.xwork2.util.*;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
-import com.opensymphony.xwork2.validator.ActionValidatorManager;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.TextProvider;
+import org.apache.struts2.xwork2.UnknownHandlerManager;
+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.conversion.ObjectTypeDeterminer;
+import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.inject.Context;
+import org.apache.struts2.xwork2.inject.Factory;
+import org.apache.struts2.xwork2.inject.Scope;
+import org.apache.struts2.xwork2.util.*;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory;
+import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
+import org.apache.struts2.xwork2.validator.ActionValidatorManager;
 
 /**
  * Selects the implementations of key framework extension points, using the loaded
@@ -72,19 +72,19 @@ import com.opensymphony.xwork2.validator
  *     <th>Description</th>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.ObjectFactory</td>
+ *     <td>org.apache.struts2.xwork2.ObjectFactory</td>
  *     <td>struts.objectFactory</td>
  *     <td>singleton</td>
  *     <td>Creates actions, results, and interceptors</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.ActionProxyFactory</td>
+ *     <td>org.apache.struts2.xwork2.ActionProxyFactory</td>
  *     <td>struts.actionProxyFactory</td>
  *     <td>singleton</td>
  *     <td>Creates the ActionProxy</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.util.ObjectTypeDeterminer</td>
+ *     <td>org.apache.struts2.xwork2.util.ObjectTypeDeterminer</td>
  *     <td>struts.objectTypeDeterminer</td>
  *     <td>singleton</td>
  *     <td>Determines what the key and element class of a Map or Collection should be</td>
@@ -114,38 +114,38 @@ import com.opensymphony.xwork2.validator
  *     <td>Loads and processes Velocity templates</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.validator.ActionValidatorManager</td>
+ *     <td>org.apache.struts2.xwork2.validator.ActionValidatorManager</td>
  *     <td>struts.actionValidatorManager</td>
  *     <td>singleton</td>
  *     <td>Main interface for validation managers (regular and annotation based).  Handles both the loading of
  *         configuration and the actual validation (since 2.1)</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.util.ValueStackFactory</td>
+ *     <td>org.apache.struts2.xwork2.util.ValueStackFactory</td>
  *     <td>struts.valueStackFactory</td>
  *     <td>singleton</td>
  *     <td>Creates value stacks (since 2.1)</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.reflection.ReflectionProvider</td>
+ *     <td>org.apache.struts2.xwork2.reflection.ReflectionProvider</td>
  *     <td>struts.reflectionProvider</td>
  *     <td>singleton</td>
  *     <td>Provides reflection services, key place to plug in a custom expression language (since 2.1)</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.reflection.ReflectionContextFactory</td>
+ *     <td>org.apache.struts2.xwork2.reflection.ReflectionContextFactory</td>
  *     <td>struts.reflectionContextFactory</td>
  *     <td>singleton</td>
  *     <td>Creates reflection context maps used for reflection and expression language operations (since 2.1)</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.config.PackageProvider</td>
+ *     <td>org.apache.struts2.xwork2.config.PackageProvider</td>
  *     <td>N/A</td>
  *     <td>singleton</td>
  *     <td>All beans registered as PackageProvider implementations will be automatically included in configuration building (since 2.1)</td>
  *   </tr>
  *   <tr>
- *     <td>com.opensymphony.xwork2.util.PatternMatcher</td>
+ *     <td>org.apache.struts2.xwork2.util.PatternMatcher</td>
  *     <td>struts.patternMatcher</td>
  *     <td>singleton</td>
  *     <td>Matches patterns, such as action names, generally used in configuration (since 2.1)</td>

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java Wed Nov 30 19:49:40 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.interceptor;
 
 import java.io.Serializable;
 
-import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionInvocation;
 
 /**
  * Background thread to be executed by the ExecuteAndWaitInterceptor.

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java Wed Nov 30 19:49:40 2011
@@ -25,11 +25,9 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.lang.ArrayUtils;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.AnnotationUtils;
-import com.opensymphony.xwork2.validator.ValidationInterceptor;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.util.AnnotationUtils;
+import org.apache.struts2.xwork2.validator.ValidationInterceptor;
 
 /**
  * Extends the xwork validation interceptor to also check for a @SkipValidation

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java Wed Nov 30 19:49:40 2011
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Anchor;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Anchor

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Bean;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Bean

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java Wed Nov 30 19:49:40 2011
@@ -21,7 +21,7 @@
 
 package org.apache.struts2.views.jsp;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 import org.apache.struts2.components.ActionComponent;
 import org.apache.struts2.components.Component;
 

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java Wed Nov 30 19:49:40 2011
@@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Bean;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.App
 import org.apache.struts2.components.Component;
 import org.apache.struts2.views.jsp.ContextBeanTag;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Anchor;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Anchor

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Anchor;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Anchor

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Bean;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Bean

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java Wed Nov 30 19:49:40 2011
@@ -26,8 +26,8 @@ import java.util.List;
 
 import org.w3c.dom.Node;
 
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java Wed Nov 30 19:49:40 2011
@@ -35,8 +35,8 @@ import org.apache.struts2.StrutsExceptio
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java Wed Nov 30 19:49:40 2011
@@ -25,9 +25,9 @@ import java.util.Locale;
 
 import org.apache.struts2.StrutsConstants;
 
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
 
 import junit.framework.TestCase;
 

Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java Wed Nov 30 19:49:40 2011
@@ -22,11 +22,10 @@
 package org.apache.struts2.interceptor.validation;
 
 import org.apache.struts2.StrutsTestCase;
-import org.easymock.EasyMock;
 
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
 
 public class AnnotationValidationInterceptorTest extends StrutsTestCase {
 

Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java Wed Nov 30 19:49:40 2011
@@ -34,11 +34,11 @@ import org.apache.struts2.TestConfigurat
 import org.apache.struts2.components.ActionComponent;
 
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
 
 
 /**

Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java Wed Nov 30 19:49:40 2011
@@ -27,8 +27,8 @@ import java.util.List;
 
 import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
 
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
 
 /**
  * Test case for AppendIteratorTag.

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.views.annotati
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * <!-- START SNIPPET: javadoc -->

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java Wed Nov 30 19:49:40 2011
@@ -31,7 +31,7 @@ import org.apache.struts2.views.annotati
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * <!-- START SNIPPET: javadoc -->

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.views.annotati
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * <!-- START SNIPPET: javadoc -->

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
 import org.apache.struts2.dojo.components.Anchor;
 import org.apache.struts2.views.freemarker.tags.TagModel;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Anchor

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
 import org.apache.struts2.dojo.components.Autocompleter;
 import org.apache.struts2.views.freemarker.tags.TagModel;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Autocompleter

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
 import org.apache.struts2.dojo.components.Bind;
 import org.apache.struts2.views.freemarker.tags.TagModel;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Bind

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Component;
 import org.apache.struts2.dojo.components.Anchor;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Anchor

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java Wed Nov 30 19:49:40 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
 import org.apache.struts2.dojo.components.Autocompleter;
 import org.apache.struts2.views.jsp.ui.ComboBoxTag;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Autocompleter

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Component;
 import org.apache.struts2.dojo.components.Bind;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 public class BindTag extends AbstractValidateTag {
     protected String targets;

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Anchor;
 import org.apache.struts2.components.Component;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Anchor

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Component;
 import org.apache.struts2.dojo.components.Autocompleter;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Autocompleter

Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java Wed Nov 30 19:49:40 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.struts2.components.Component;
 import org.apache.struts2.dojo.components.Bind;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
 
 /**
  * @see Bind

Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleClassLoaderInterface.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleClassLoaderInterface.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleClassLoaderInterface.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleClassLoaderInterface.java Wed Nov 30 19:49:40 2011
@@ -21,7 +21,7 @@
 
 package org.apache.struts2.osgi;
 
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
 
 import java.net.URL;
 import java.util.Enumeration;
@@ -29,8 +29,6 @@ import java.util.Collections;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.osgi.framework.Bundle;
-
 /**
  * ClassLoaderInterface instance that delegates to the singleton of DefaultBundleAccessor 
  */

Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java Wed Nov 30 19:49:40 2011
@@ -21,8 +21,8 @@
 
 package org.apache.struts2.osgi;
 
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.cache.MultiTemplateLoader;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/ActionSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/ActionSupport.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/ActionSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/ActionSupport.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;
+package org.apache.struts2.xwork2;
 
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -167,7 +167,7 @@ public class ActionSupport implements Ac
      * <p/>
      * Subclasses should override this method to provide their business logic.
      * <p/>
-     * See also {@link com.opensymphony.xwork2.Action#execute()}.
+     * See also {@link org.apache.struts2.xwork2.Action#execute()}.
      *
      * @return returns {@link #SUCCESS}
      * @throws Exception can be thrown by subclasses.
@@ -263,9 +263,9 @@ public class ActionSupport implements Ac
     }
 
     /**
-     * If called first time it will create {@link com.opensymphony.xwork2.TextProviderFactory},
-     * inject dependency (if {@link com.opensymphony.xwork2.inject.Container} is accesible) into in,
-     * then will create new {@link com.opensymphony.xwork2.TextProvider} and store it in a field
+     * If called first time it will create {@link org.apache.struts2.xwork2.TextProviderFactory},
+     * inject dependency (if {@link org.apache.struts2.xwork2.inject.Container} is accesible) into in,
+     * then will create new {@link org.apache.struts2.xwork2.TextProvider} and store it in a field
      * for future references and at the returns reference to that field
      *
      * @return reference to field with TextProvider

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverter.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/conversion/impl/AnnotationXWorkConverter.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.conversion.impl;
+package org.apache.struts2.xwork2.conversion.impl;
 
 /**
  * <!-- START SNIPPET: javadoc -->
@@ -84,7 +84,7 @@ package com.opensymphony.xwork2.conversi
  *
  * @author <a href="mailto:plightbo@gmail.com">Pat Lightbody</a>
  * @author Rainer Hermanns
- * @see com.opensymphony.xwork2.conversion.impl.XWorkConverter
+ * @see org.apache.struts2.xwork2.conversion.impl.XWorkConverter
  * @deprecated Since XWork 2.0.4, the implementation of XWorkConverter handles the processing of annotations.
  */
 @Deprecated public class AnnotationXWorkConverter extends XWorkConverter {

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/AliasInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/AliasInterceptor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/AliasInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/AliasInterceptor.java Wed Nov 30 19:49:40 2011
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.opensymphony.xwork2.interceptor;
+package org.apache.struts2.xwork2.interceptor;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ClearableValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ClearableValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.reflection.ReflectionContextState;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
 
 import java.util.Map;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/After.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/After.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/After.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/After.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;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Allowed.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Allowed.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Allowed.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Allowed.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;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationParameterFilterIntereptor.java Wed Nov 30 19:49:40 2011
@@ -1,13 +1,13 @@
-package com.opensymphony.xwork2.interceptor.annotations;
+package org.apache.struts2.xwork2.interceptor.annotations;
 
 
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import com.opensymphony.xwork2.util.AnnotationUtils;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.AbstractInterceptor;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.interceptor.ParameterFilterInterceptor;
+import org.apache.struts2.xwork2.interceptor.ParametersInterceptor;
+import org.apache.struts2.xwork2.util.AnnotationUtils;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@ import java.util.Map;
 public class AnnotationParameterFilterIntereptor extends AbstractInterceptor {
 
     /* (non-Javadoc)
-      * @see com.opensymphony.xwork2.interceptor.AbstractInterceptor#intercept(com.opensymphony.xwork2.ActionInvocation)
+      * @see org.apache.struts2.xwork2.interceptor.AbstractInterceptor#intercept(org.apache.struts2.xwork2.ActionInvocation)
       */
     @Override public String intercept(ActionInvocation invocation) throws Exception {
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.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.annotations;
+package org.apache.struts2.xwork2.interceptor.annotations;
 
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.XWorkException;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.AnnotationUtils;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.XWorkException;
+import org.apache.struts2.xwork2.interceptor.AbstractInterceptor;
+import org.apache.struts2.xwork2.interceptor.PreResultListener;
+import org.apache.struts2.xwork2.util.AnnotationUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -108,7 +108,7 @@ public class AnnotationWorkflowIntercept
     /**
      * Discovers annotated methods on the action and calls them according to the workflow
      *
-     * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation)
+     * @see org.apache.struts2.xwork2.interceptor.Interceptor#intercept(org.apache.struts2.xwork2.ActionInvocation)
      */
     public String intercept(ActionInvocation invocation) throws Exception {
         final Object action = invocation.getAction();
@@ -166,7 +166,7 @@ public class AnnotationWorkflowIntercept
     /**
      * Invokes any &#64;BeforeResult annotated methods
      *
-     * @see com.opensymphony.xwork2.interceptor.PreResultListener#beforeResult(com.opensymphony.xwork2.ActionInvocation,String)
+     * @see org.apache.struts2.xwork2.interceptor.PreResultListener#beforeResult(org.apache.struts2.xwork2.ActionInvocation,String)
      */
     public void beforeResult(ActionInvocation invocation, String resultCode) {
         Object action = invocation.getAction();

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Before.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Before.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Before.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Before.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;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BeforeResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BeforeResult.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BeforeResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BeforeResult.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;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BlockByDefault.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BlockByDefault.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BlockByDefault.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/BlockByDefault.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.Action;
+import org.apache.struts2.xwork2.Action;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Blocked.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Blocked.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Blocked.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/interceptor/annotations/Blocked.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;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/AnnotationUtils.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/AnnotationUtils.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/AnnotationUtils.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.util;
+package org.apache.struts2.xwork2.util;
 
 import java.io.File;
 import java.lang.annotation.Annotation;

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/ArrayUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/ArrayUtils.java?rev=1208734&r1=1208733&r2=1208734&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/ArrayUtils.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/util/ArrayUtils.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.util;
+package org.apache.struts2.xwork2.util;
 
 /**
  * @author Dan Oxlade, dan d0t oxlade at gmail d0t c0m

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/ActionValidatorManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/ActionValidatorManager.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/ActionValidatorManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/ActionValidatorManager.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.validator;
+package org.apache.struts2.xwork2.validator;
 
 import java.util.List;
 

Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManager.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/AnnotationActionValidatorManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/AnnotationActionValidatorManager.java Wed Nov 30 19:49:40 2011
@@ -13,19 +13,19 @@
  * 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.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.validator.validators.VisitorFieldValidator;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.FileManager;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
@@ -384,10 +384,10 @@ public class AnnotationActionValidatorMa
 
 
     /**
-     * An {@link com.opensymphony.xwork2.validator.ValidatorContext} wrapper that
+     * An {@link org.apache.struts2.xwork2.validator.ValidatorContext} wrapper that
      * returns the full field name
      * {@link AnnotationActionValidatorManager.InternalValidatorContextWrapper#getFullFieldName(String)}
-     * by consulting it's parent if its an {@link com.opensymphony.xwork2.validator.validators.VisitorFieldValidator.AppendingValidatorContext}.
+     * by consulting it's parent if its an {@link org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator.AppendingValidatorContext}.
      * <p/>
      * Eg. if we have nested Visitor
      * AddressVisitor nested inside PersonVisitor, when using the normal #getFullFieldName, we will get



Mime
View raw message