You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/02 17:33:45 UTC
svn commit: r1209569 [11/50] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mai...
Modified: struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/JUnitTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/JUnitTestAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/JUnitTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/JUnitTestAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class JUnitTestAction extends ActionSupport {
private String name;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsSpringJUnit4TestCaseTest.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionProxy;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.junit.Assert;
import org.junit.Test;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/junit/src/test/java/org/apache/struts2/StrutsTestCaseTest.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionProxy;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import javax.servlet.ServletException;
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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java Fri Dec 2 16:33:03 2011
@@ -25,22 +25,17 @@ import java.io.IOException;
import java.net.URL;
import java.util.*;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.config.impl.DefaultConfiguration;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.PackageProvider;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.location.Location;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* Package loader implementation that loads resources from a bundle
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DefaultBundleAccessor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DefaultBundleAccessor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DefaultBundleAccessor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DefaultBundleAccessor.java Fri Dec 2 16:33:03 2011
@@ -24,23 +24,19 @@ package org.apache.struts2.osgi;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.net.MalformedURLException;
import java.util.*;
-import java.util.Map.Entry;
+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.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-
/**
* Helper class that find resources and loads classes from the list of bundles
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DelegatingObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DelegatingObjectFactory.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DelegatingObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/DelegatingObjectFactory.java Fri Dec 2 16:33:03 2011
@@ -23,10 +23,10 @@ package org.apache.struts2.osgi;
import java.util.Map;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.PackageProvider;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.PackageProvider;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.inject.Inject;
import org.apache.struts2.util.ObjectFactoryDestroyable;
public class DelegatingObjectFactory extends ObjectFactory implements ObjectFactoryDestroyable {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java Fri Dec 2 16:33:03 2011
@@ -21,27 +21,22 @@
package org.apache.struts2.osgi;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.URLUtil;
-import com.opensymphony.xwork2.util.finder.ResourceFinder;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.util.URLUtil;
+import org.apache.struts2.xwork2.util.finder.ResourceFinder;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.felix.framework.Felix;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.main.AutoActivator;
import org.apache.felix.main.Main;
import org.apache.felix.shell.ShellService;
-import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsException;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.Constants;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleListener;
-import org.osgi.framework.BundleEvent;
import org.osgi.util.tracker.ServiceTracker;
import javax.servlet.ServletContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java Fri Dec 2 16:33:03 2011
@@ -21,16 +21,16 @@
package org.apache.struts2.osgi;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.PackageProvider;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
-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.ObjectFactory;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.PackageProvider;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.osgi.loaders.VelocityBundleResourceLoader;
import org.apache.struts2.views.velocity.VelocityManager;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiUtil.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiUtil.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiUtil.java Fri Dec 2 16:33:03 2011
@@ -21,17 +21,13 @@
package org.apache.struts2.osgi;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.MalformedURLException;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.osgi.framework.Bundle;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
public class OsgiUtil {
private static final Logger LOG = LoggerFactory.getLogger(OsgiUtil.class);
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/PackageLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/PackageLoader.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/PackageLoader.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/PackageLoader.java Fri Dec 2 16:33:03 2011
@@ -24,14 +24,12 @@ package org.apache.struts2.osgi;
import java.util.List;
import java.util.Map;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.PackageProvider;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-
/**
* Implementations of this interface can load packages from a Bundle
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/SpringOsgiObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/SpringOsgiObjectFactory.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/SpringOsgiObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/SpringOsgiObjectFactory.java Fri Dec 2 16:33:03 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.osgi;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.inject.Inject;
import org.osgi.framework.ServiceReference;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java Fri Dec 2 16:33:03 2011
@@ -20,11 +20,11 @@
*/
package org.apache.struts2.osgi.interceptor;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.AbstractInterceptor;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.inject.Inject;
import javax.servlet.ServletContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/StaticContentBundleResourceLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/StaticContentBundleResourceLoader.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/StaticContentBundleResourceLoader.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/StaticContentBundleResourceLoader.java Fri Dec 2 16:33:03 2011
@@ -22,13 +22,11 @@
package org.apache.struts2.osgi.loaders;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import org.apache.struts2.dispatcher.DefaultStaticContentLoader;
-import org.apache.struts2.osgi.DefaultBundleAccessor;
import org.apache.struts2.osgi.BundleAccessor;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.inject.Inject;
/**
* Loads static resources from bundles
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-osgi.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-osgi.properties?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-osgi.properties (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-osgi.properties Fri Dec 2 16:33:03 2011
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-scanning.package.includes = com.opensymphony.xwork2, \
+scanning.package.includes = org.apache.struts2.xwork2, \
org.apache.commons.lang.xwork, \
org.apache.struts2, \
ognl, \
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-plugin.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-plugin.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/main/resources/struts-plugin.xml Fri Dec 2 16:33:03 2011
@@ -15,10 +15,10 @@
<bean type="org.apache.struts2.osgi.BundleAccessor" class="org.apache.struts2.osgi.DefaultBundleAccessor" />
<bean type="org.apache.struts2.osgi.PackageLoader" class="org.apache.struts2.osgi.BundlePackageLoader" />
- <bean name="osgi" type="com.opensymphony.xwork2.ObjectFactory" class="org.apache.struts2.osgi.DelegatingObjectFactory" />
- <bean name="springOsgi" type="com.opensymphony.xwork2.ObjectFactory" class="org.apache.struts2.osgi.SpringOsgiObjectFactory" />
- <bean name="osgi" type="com.opensymphony.xwork2.config.PackageProvider" class="org.apache.struts2.osgi.OsgiConfigurationProvider" />
- <bean name="osgi" type="com.opensymphony.xwork2.util.finder.ClassLoaderInterface" class="org.apache.struts2.osgi.BundleClassLoaderInterface" />
+ <bean name="osgi" type="org.apache.struts2.xwork2.ObjectFactory" class="org.apache.struts2.osgi.DelegatingObjectFactory" />
+ <bean name="springOsgi" type="org.apache.struts2.xwork2.ObjectFactory" class="org.apache.struts2.osgi.SpringOsgiObjectFactory" />
+ <bean name="osgi" type="org.apache.struts2.xwork2.config.PackageProvider" class="org.apache.struts2.osgi.OsgiConfigurationProvider" />
+ <bean name="osgi" type="org.apache.struts2.xwork2.util.finder.ClassLoaderInterface" class="org.apache.struts2.osgi.BundleClassLoaderInterface" />
<package name="osgi-default" extends="struts-default" abstract="yes">
<interceptors>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java Fri Dec 2 16:33:03 2011
@@ -1,5 +1,6 @@
package org.apache.struts2.osgi.interceptor;
+import org.apache.struts2.xwork2.ActionInvocation;
import org.easymock.EasyMock;
import org.apache.struts2.osgi.OsgiHost;
import org.osgi.framework.BundleContext;
@@ -7,7 +8,6 @@ import org.osgi.framework.ServiceReferen
import javax.servlet.ServletContext;
-import com.opensymphony.xwork2.ActionInvocation;
import junit.framework.TestCase;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java Fri Dec 2 16:33:03 2011
@@ -1,9 +1,8 @@
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.FileManager;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import net.sf.oval.configuration.Configurer;
import net.sf.oval.configuration.annotation.AnnotationsConfigurer;
import net.sf.oval.configuration.annotation.JPAAnnotationsConfigurer;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java Fri Dec 2 16:33:03 2011
@@ -20,18 +20,18 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
-import com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil;
-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.DelegatingValidatorContext;
-import com.opensymphony.xwork2.validator.ValidatorContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.Validateable;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.interceptor.MethodFilterInterceptor;
+import org.apache.struts2.xwork2.interceptor.PrefixMethodInvocationUtil;
+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.DelegatingValidatorContext;
+import org.apache.struts2.xwork2.validator.ValidatorContext;
import net.sf.oval.ConstraintViolation;
import net.sf.oval.Validator;
import net.sf.oval.configuration.Configurer;
@@ -72,7 +72,7 @@ public class OValValidationInterceptor e
}
/**
- * Determines if {@link com.opensymphony.xwork2.Validateable}'s <code>validate()</code> should be called,
+ * Determines if {@link org.apache.struts2.xwork2.Validateable}'s <code>validate()</code> should be called,
* as well as methods whose name that start with "validate". Defaults to "true".
*
* @param programmatic <tt>true</tt> then <code>validate()</code> is invoked.
@@ -82,7 +82,7 @@ public class OValValidationInterceptor e
}
/**
- * Determines if {@link com.opensymphony.xwork2.Validateable}'s <code>validate()</code> should always
+ * Determines if {@link org.apache.struts2.xwork2.Validateable}'s <code>validate()</code> should always
* be invoked. Default to "true".
*
* @param alwaysInvokeValidate <tt>true</tt> then <code>validate()</code> is always invoked.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import net.sf.oval.constraint.NotNull;
import org.apache.struts2.oval.annotation.Profiles;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/MemberObject.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/MemberObject.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/MemberObject.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/MemberObject.java Fri Dec 2 16:33:03 2011
@@ -4,7 +4,7 @@ import net.sf.oval.constraint.AssertVali
import org.apache.struts2.oval.interceptor.domain.Person;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class MemberObject extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ModelDrivenAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ModelDrivenAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ModelDrivenAction.java Fri Dec 2 16:33:03 2011
@@ -4,8 +4,8 @@ import net.sf.oval.constraint.AssertVali
import org.apache.struts2.oval.interceptor.domain.Person;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ModelDriven;
public class ModelDrivenAction extends ActionSupport implements ModelDriven<Person> {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java Fri Dec 2 16:33:03 2011
@@ -20,10 +20,10 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.Arrays;
import java.util.List;
@@ -31,7 +31,6 @@ import java.util.Map;
import java.util.Locale;
import net.sf.oval.configuration.Configurer;
-import org.apache.struts2.oval.interceptor.OValValidationManager;
public class OValValidationInterceptorTest extends XWorkTestCase {
public void testSimpleFieldsXML() throws Exception {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java Fri Dec 2 16:33:03 2011
@@ -23,9 +23,9 @@ package org.apache.struts2.oval.intercep
import net.sf.oval.constraint.Length;
import net.sf.oval.constraint.NotEmpty;
import net.sf.oval.constraint.NotNull;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
-public class SimpleField extends ActionSupport{
+public class SimpleField extends ActionSupport {
@NotNull()
@NotEmpty
@Length(max = 3)
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java Fri Dec 2 16:33:03 2011
@@ -20,10 +20,8 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import net.sf.oval.constraint.NotNull;
-import net.sf.oval.constraint.NotEmpty;
-import net.sf.oval.constraint.Length;
public class SimpleFieldI18n extends ActionSupport {
@NotNull(message = "notnull.field")
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java Fri Dec 2 16:33:03 2011
@@ -20,10 +20,8 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import net.sf.oval.constraint.NotNull;
-import net.sf.oval.constraint.NotEmpty;
-import net.sf.oval.constraint.Length;
public class SimpleFieldI18nDefaultKey extends ActionSupport {
@NotNull(message = "notnull.field")
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import javax.persistence.Basic;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java Fri Dec 2 16:33:03 2011
@@ -20,11 +20,8 @@
*/
package org.apache.struts2.oval.interceptor;
-import net.sf.oval.constraint.NotNull;
-import net.sf.oval.constraint.NotEmpty;
-import net.sf.oval.constraint.Length;
import net.sf.oval.constraint.Assert;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class SimpleFieldOGNLExpression extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java Fri Dec 2 16:33:03 2011
@@ -1,7 +1,6 @@
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
-import net.sf.oval.constraint.NotEmpty;
+import org.apache.struts2.xwork2.ActionSupport;
import net.sf.oval.constraint.NotNull;
public class SimpleFieldsXML extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import net.sf.oval.constraint.Length;
import net.sf.oval.constraint.NotNull;
import net.sf.oval.configuration.annotation.IsInvariant;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import net.sf.oval.constraint.NotNull;
import net.sf.oval.configuration.annotation.IsInvariant;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.oval.interceptor;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Result;
public class VoidResult implements Result {
public void execute(ActionInvocation invocation) throws Exception {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java Fri Dec 2 16:33:03 2011
@@ -35,9 +35,9 @@ import javax.servlet.http.HttpServletReq
import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.inject.Inject;
-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.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java Fri Dec 2 16:33:03 2011
@@ -34,11 +34,10 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.codehaus.plexus.PlexusContainer;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* Creates a plexus container for the application, session, and request
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java Fri Dec 2 16:33:03 2011
@@ -30,12 +30,11 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* Manages the Plexus lifecycle for the servlet and session contexts
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java Fri Dec 2 16:33:03 2011
@@ -26,21 +26,20 @@ import java.util.Map;
import javax.servlet.ServletContext;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.Result;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.validator.Validator;
import org.codehaus.plexus.PlexusContainer;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.validator.Validator;
-
/**
* Plexus integartion. You need three optional files: plexus-request.xml, plexus-session.xml, and
* plexus-application.xml.
@@ -114,7 +113,7 @@ public class PlexusObjectFactory extends
}
/* (non-Javadoc)
- * @see com.opensymphony.xwork2.ObjectFactory#buildAction(java.lang.String, java.lang.String, com.opensymphony.xwork2.config.entities.ActionConfig, java.util.Map)
+ * @see org.apache.struts2.xwork2.ObjectFactory#buildAction(java.lang.String, java.lang.String, org.apache.struts2.xwork2.config.entities.ActionConfig, java.util.Map)
*/
public Object buildAction(String actionName, String namespace, ActionConfig config, Map extraContext)
throws Exception {
@@ -128,7 +127,7 @@ public class PlexusObjectFactory extends
}
/* (non-Javadoc)
- * @see com.opensymphony.xwork2.ObjectFactory#buildInterceptor(com.opensymphony.xwork2.config.entities.InterceptorConfig, java.util.Map)
+ * @see org.apache.struts2.xwork2.ObjectFactory#buildInterceptor(org.apache.struts2.xwork2.config.entities.InterceptorConfig, java.util.Map)
*/
public Interceptor buildInterceptor(InterceptorConfig interceptorConfig, Map interceptorRefParams)
throws ConfigurationException {
@@ -159,7 +158,7 @@ public class PlexusObjectFactory extends
}
catch (ClassCastException e) {
cause = e;
- message = "Class [" + interceptorClassName + "] does not implement com.opensymphony.xwork2.interceptor.Interceptor";
+ message = "Class [" + interceptorClassName + "] does not implement org.apache.struts2.xwork2.interceptor.Interceptor";
}
catch (Exception e) {
cause = e;
@@ -174,7 +173,7 @@ public class PlexusObjectFactory extends
}
/* (non-Javadoc)
- * @see com.opensymphony.xwork2.ObjectFactory#buildResult(com.opensymphony.xwork2.config.entities.ResultConfig, java.util.Map)
+ * @see org.apache.struts2.xwork2.ObjectFactory#buildResult(org.apache.struts2.xwork2.config.entities.ResultConfig, java.util.Map)
*/
public Result buildResult(ResultConfig resultConfig, Map extraContext)
throws Exception {
@@ -188,7 +187,7 @@ public class PlexusObjectFactory extends
}
/* (non-Javadoc)
- * @see com.opensymphony.xwork2.ObjectFactory#buildValidator(java.lang.String, java.util.Map, java.util.Map)
+ * @see org.apache.struts2.xwork2.ObjectFactory#buildValidator(java.lang.String, java.util.Map, java.util.Map)
*/
public Validator buildValidator(String className, Map params, Map extraContext)
throws Exception {
@@ -201,7 +200,7 @@ public class PlexusObjectFactory extends
}
/* (non-Javadoc)
- * @see com.opensymphony.xwork2.ObjectFactory#buildBean(java.lang.Class, java.util.Map)
+ * @see org.apache.struts2.xwork2.ObjectFactory#buildBean(java.lang.Class, java.util.Map)
*/
public Object buildBean(Class clazz, Map extraContext)
throws Exception {
@@ -222,7 +221,7 @@ public class PlexusObjectFactory extends
}
/* (non-Javadoc)
- * @see com.opensymphony.xwork2.ObjectFactory#getClassInstance(java.lang.String)
+ * @see org.apache.struts2.xwork2.ObjectFactory#getClassInstance(java.lang.String)
*/
public Class getClassInstance(String className)
throws ClassNotFoundException {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java Fri Dec 2 16:33:03 2011
@@ -25,12 +25,11 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* Utility methods for dealing with Plexus
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/plexus/src/main/resources/struts-plugin.xml Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <bean type="com.opensymphony.xwork2.ObjectFactory" name="plexus" class="org.apache.struts2.plexus.PlexusObjectFactory" />
+ <bean type="org.apache.struts2.xwork2.ObjectFactory" name="plexus" class="org.apache.struts2.plexus.PlexusObjectFactory" />
<!-- Make the Plexus object factory the automatic default -->
<constant name="struts.objectFactory" value="plexus" />
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Fri Dec 2 16:33:03 2011
@@ -30,11 +30,11 @@ import org.apache.struts2.portlet.contex
import org.apache.struts2.portlet.util.PortletUrlHelper;
import org.apache.struts2.portlet.util.PortletUrlHelperJSR286;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-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.inject.Inject;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* Implementation of the {@link UrlRenderer} interface that renders URLs for portlet environments.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java Fri Dec 2 16:33:03 2011
@@ -27,8 +27,8 @@ import java.util.Set;
import javax.portlet.PortletRequest;
-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;
/**
* A simple implementation of the {@link java.util.Map} interface to handle a collection of request attributes.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java Fri Dec 2 16:33:03 2011
@@ -29,8 +29,8 @@ import java.util.Set;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-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;
/**
* A simple implementation of the {@link java.util.Map} interface to handle a collection of portlet session
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java Fri Dec 2 16:33:03 2011
@@ -34,7 +34,7 @@ import javax.portlet.RenderResponse;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
import static org.apache.struts2.portlet.PortletConstants.*;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.portlet.dispatcher;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
import java.io.Serializable;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Fri Dec 2 16:33:03 2011
@@ -77,15 +77,15 @@ import org.apache.struts2.portlet.servle
import org.apache.struts2.portlet.servlet.PortletServletResponse;
import org.apache.struts2.util.AttributeMap;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-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.ActionProxy;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.FileManager;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
+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/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java Fri Dec 2 16:33:03 2011
@@ -1,8 +1,8 @@
package org.apache.struts2.portlet.dispatcher;
-import com.opensymphony.xwork2.ActionContext;
-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.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.portlet.servlet.PortletServletResponse;
import org.apache.struts2.portlet.servlet.PortletServletResponseJSR286;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java Fri Dec 2 16:33:03 2011
@@ -28,11 +28,11 @@ import org.apache.struts2.StrutsStatics;
import org.apache.struts2.interceptor.PrincipalAware;
import org.apache.struts2.portlet.PortletActionConstants;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-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.interceptor.AbstractInterceptor;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
public class PortletAwareInterceptor extends AbstractInterceptor implements PortletActionConstants, StrutsStatics {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java Fri Dec 2 16:33:03 2011
@@ -36,12 +36,12 @@ import javax.portlet.RenderRequest;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.util.CompoundRoot;
-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.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.AbstractInterceptor;
+import org.apache.struts2.xwork2.util.CompoundRoot;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
public class PortletStateInterceptor extends AbstractInterceptor {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java Fri Dec 2 16:33:03 2011
@@ -34,9 +34,9 @@ import org.apache.struts2.dispatcher.map
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.views.util.UrlHelper;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.inject.Inject;
/**
*
@@ -170,7 +170,7 @@ public class PortletActionRedirectResult
}
/**
- * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
+ * @see org.apache.struts2.xwork2.Result#execute(org.apache.struts2.xwork2.ActionInvocation)
*/
public void execute(ActionInvocation invocation) throws Exception {
actionName = conditionalParse(actionName, invocation);
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Fri Dec 2 16:33:03 2011
@@ -42,10 +42,10 @@ import org.apache.struts2.dispatcher.Str
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* Result type that includes a JSP to render.
@@ -95,7 +95,7 @@ public class PortletResult extends Strut
* {@link javax.portlet.PortletRequestDispatcher}from the
* {@link PortletActionContext}and includes the JSP.
*
- * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
+ * @see org.apache.struts2.xwork2.Result#execute(org.apache.struts2.xwork2.ActionInvocation)
*/
public void doExecute(String finalLocation, ActionInvocation actionInvocation) throws Exception {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java Fri Dec 2 16:33:03 2011
@@ -38,17 +38,16 @@ import org.apache.struts2.portlet.Portle
import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.struts2.views.JspSupportServlet;
import org.apache.struts2.views.velocity.VelocityManager;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+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.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-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;
-
/**
* <!-- START SNIPPET: description -->
*
@@ -116,7 +115,7 @@ public class PortletVelocityResult exten
}
/* (non-Javadoc)
- * @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation)
+ * @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String, org.apache.struts2.xwork2.ActionInvocation)
*/
public void doExecute(String location, ActionInvocation invocation)
throws Exception {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java Fri Dec 2 16:33:03 2011
@@ -9,8 +9,8 @@ import javax.portlet.PortletResponse;
import javax.portlet.ResourceResponse;
import javax.servlet.ServletOutputStream;
-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;
/**
* PortletServletResponseJSR286.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Fri Dec 2 16:33:03 2011
@@ -41,8 +41,8 @@ import org.apache.commons.lang.StringUti
import org.apache.struts2.StrutsException;
import org.apache.struts2.portlet.context.PortletActionContext;
-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;
/**
* Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java Fri Dec 2 16:33:03 2011
@@ -7,8 +7,8 @@ import javax.portlet.BaseURL;
import javax.portlet.PortletSecurityException;
import java.util.Map;
-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;
/**
* PortletUrlJSR286Helper.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,6 @@ import java.util.Locale;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -37,9 +36,9 @@ import org.apache.struts2.portlet.Portle
import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.struts2.views.util.ResourceUtil;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
import freemarker.template.Configuration;
import freemarker.template.ObjectWrapper;
@@ -165,7 +164,7 @@ public class PortletFreemarkerResult ext
}
/**
- * This method is called from {@link #doExecute(String, ActionInvocation)}
+ * This method is called from {@link #doExecute(String, org.apache.struts2.xwork2.ActionInvocation)}
* to obtain the FreeMarker configuration object that this result will use
* for template loading. This is a hook that allows you to custom-configure
* the configuration object in a subclass, or to fetch it from an IoC
@@ -178,7 +177,7 @@ public class PortletFreemarkerResult ext
}
/**
- * This method is called from {@link #doExecute(String, ActionInvocation)}
+ * This method is called from {@link #doExecute(String, org.apache.struts2.xwork2.ActionInvocation)}
* to obtain the FreeMarker object wrapper object that this result will use
* for adapting objects into template models. This is a hook that allows you
* to custom-configure the wrapper object in a subclass. <p/><b>The default
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java Fri Dec 2 16:33:03 2011
@@ -33,11 +33,10 @@ import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.xwork2.ActionContext;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
-import com.opensymphony.xwork2.ActionContext;
-
/**
*/
public class PortletActionContextTest extends MockObjectTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java Fri Dec 2 16:33:03 2011
@@ -20,14 +20,15 @@
*/
package org.apache.struts2.portlet.dispatcher;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import static org.apache.struts2.portlet.PortletConstants.*;
+
import org.easymock.EasyMock;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java Fri Dec 2 16:33:03 2011
@@ -28,11 +28,10 @@ import javax.portlet.PortletRequest;
import junit.framework.TestCase;
import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
import org.easymock.EasyMock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-
public class PortletAwareInterceptorTest extends TestCase implements PortletActionConstants {
private PortletAwareInterceptor interceptor;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java Fri Dec 2 16:33:03 2011
@@ -29,13 +29,12 @@ import javax.portlet.RenderRequest;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.DefaultActionSupport;
import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
import org.easymock.EasyMock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-
import static org.apache.struts2.portlet.PortletConstants.*;
public class PortletStateInterceptorTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.portlet.result;
import static org.apache.struts2.portlet.PortletConstants.*;
-import static com.opensymphony.xwork2.ActionContext.*;
+import static org.apache.struts2.xwork2.ActionContext.*;
import java.util.HashMap;
import java.util.Map;
@@ -37,13 +37,12 @@ import javax.portlet.RenderResponse;
import junit.textui.TestRunner;
import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-
/**
* PortletResultTest. Insert description.
*
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java Fri Dec 2 16:33:03 2011
@@ -38,10 +38,9 @@ import javax.portlet.WindowStateExceptio
import junit.framework.TestCase;
+import org.apache.struts2.xwork2.ActionContext;
import org.easymock.EasyMock;
-import com.opensymphony.xwork2.ActionContext;
-
/**
*/
public class PortletUrlHelperTest extends TestCase {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Fri Dec 2 16:33:03 2011
@@ -35,20 +35,19 @@ import junit.textui.TestRunner;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.StrutsStatics;
+
import static org.apache.struts2.StrutsStatics.*;
+
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
import com.mockobjects.servlet.MockJspWriter;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import static com.opensymphony.xwork2.ActionContext.SESSION;
-import static com.opensymphony.xwork2.ActionContext.PARAMETERS;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import org.apache.struts2.rest.handler.C
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
import java.io.IOException;