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 [2/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/mail...
Modified: struts/struts2/branches/STRUTS_3_X/apps/blank/src/main/java/example/ExampleSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/blank/src/main/java/example/ExampleSupport.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/blank/src/main/java/example/ExampleSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/blank/src/main/java/example/ExampleSupport.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package example;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Base Action class for the Tutorial package.
Modified: struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/ConfigTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/ConfigTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/ConfigTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/ConfigTest.java Fri Dec 2 16:33:03 2011
@@ -21,11 +21,11 @@
package example;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.config.RuntimeConfiguration;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import org.apache.struts2.StrutsTestCase;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/HelloWorldTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/HelloWorldTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/HelloWorldTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/HelloWorldTest.java Fri Dec 2 16:33:03 2011
@@ -23,8 +23,7 @@ package example;
import org.apache.struts2.StrutsTestCase;
-import com.opensymphony.xwork2.ActionSupport;
-import junit.framework.TestCase;
+import org.apache.struts2.xwork2.ActionSupport;
public class HelloWorldTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/LoginTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/LoginTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/LoginTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/blank/src/test/java/example/LoginTest.java Fri Dec 2 16:33:03 2011
@@ -21,8 +21,8 @@
package example;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/main/java/example/ExampleSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/main/java/example/ExampleSupport.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/main/java/example/ExampleSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/main/java/example/ExampleSupport.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package example;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Base Action class for the Tutorial package.
Modified: struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/ConfigTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/ConfigTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/ConfigTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/ConfigTest.java Fri Dec 2 16:33:03 2011
@@ -21,11 +21,11 @@
package example;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.config.RuntimeConfiguration;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import org.apache.struts2.StrutsTestCase;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/HelloWorldTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/HelloWorldTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/HelloWorldTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/HelloWorldTest.java Fri Dec 2 16:33:03 2011
@@ -23,8 +23,7 @@ package example;
import org.apache.struts2.StrutsTestCase;
-import com.opensymphony.xwork2.ActionSupport;
-import junit.framework.TestCase;
+import org.apache.struts2.xwork2.ActionSupport;
public class HelloWorldTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/LoginTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/LoginTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/LoginTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/jboss-blank/src/test/java/example/LoginTest.java Fri Dec 2 16:33:03 2011
@@ -21,8 +21,8 @@
package example;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
import java.util.Map;
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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 2011
@@ -20,13 +20,14 @@
*/
package mailreader2;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+
import java.util.Map;
import org.apache.struts.apps.mailreader.dao.User;
-public class AuthenticationInterceptor implements Interceptor {
+public class AuthenticationInterceptor implements Interceptor {
public void destroy () {}
@@ -41,7 +42,7 @@ public class AuthenticationInterceptor i
boolean isAuthenticated = (null!=user) && (null!=user.getDatabase());
if (!isAuthenticated) {
- return Action.LOGIN;
+ return Action.LOGIN;
}
else {
return actionInvocation.invoke();
Modified: struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java Fri Dec 2 16:33:03 2011
@@ -32,9 +32,9 @@ import org.apache.struts.apps.mailreader
import org.apache.struts2.interceptor.ApplicationAware;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <p> Base Action for MailreaderSupport application. </p>
Modified: struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/Subscription.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/Subscription.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/Subscription.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/java/mailreader2/Subscription.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package mailreader2;
-import com.opensymphony.xwork2.Preparable;
+import org.apache.struts2.xwork2.Preparable;
import java.util.LinkedHashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/webapp/tour.html
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/webapp/tour.html?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/webapp/tour.html (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/mailreader/src/main/webapp/tour.html Fri Dec 2 16:33:03 2011
@@ -1415,9 +1415,9 @@ public void <strong>setSession(Map value
<hr/>
<h5>mailreader2.AuthenticationInterceptor</h5>
<pre><code>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/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java Fri Dec 2 16:33:03 2011
@@ -22,8 +22,8 @@ package org.apache.struts2.portlet.examp
import java.util.Map;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
public class ExampleAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java Fri Dec 2 16:33:03 2011
@@ -22,8 +22,6 @@ package org.apache.struts2.portlet.examp
import org.apache.struts2.dispatcher.DefaultActionSupport;
-import com.opensymphony.xwork2.ActionSupport;
-
/**
*/
public class FormExample extends DefaultActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java Fri Dec 2 16:33:03 2011
@@ -22,8 +22,8 @@ package org.apache.struts2.portlet.examp
import org.apache.struts2.portlet.example.model.Name;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ModelDriven;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.portlet.example;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import javax.portlet.RenderRequest;
import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.portlet.example;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import javax.portlet.ActionRequest;
import javax.portlet.PortletPreferences;
import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java Fri Dec 2 16:33:03 2011
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.portlet.example.eventing;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.portlet.interceptor.PortletRequestAware;
import org.apache.struts2.portlet.interceptor.PortletResponseAware;
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java Fri Dec 2 16:33:03 2011
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.portlet.example.eventing;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.portlet.interceptor.PortletResponseAware;
import javax.portlet.ActionResponse;
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-edit.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-edit.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-edit.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-edit.xml Fri Dec 2 16:33:03 2011
@@ -7,11 +7,11 @@
<package name="edit" extends="struts-portlet-default"
namespace="/edit">
<action name="index"
- class="com.opensymphony.xwork2.ActionSupport">
+ class="org.apache.struts2.xwork2.ActionSupport">
<result name="success">/WEB-INF/edit/index.jsp</result>
</action>
<action name="test"
- class="com.opensymphony.xwork2.ActionSupport">
+ class="org.apache.struts2.xwork2.ActionSupport">
<result name="success">/WEB-INF/edit/test.jsp</result>
</action>
<action name="formExampleEdit"
@@ -41,7 +41,7 @@
<package name="editTest" extends="edit" namespace="/edit/dummy/test">
<action name="testAction"
- class="com.opensymphony.xwork2.ActionSupport">
+ class="org.apache.struts2.xwork2.ActionSupport">
<result name="success">/WEB-INF/edit/namespaceTest.jsp</result>
</action>
</package>
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-help.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-help.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-help.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-help.xml Fri Dec 2 16:33:03 2011
@@ -7,7 +7,7 @@
<package name="help" extends="struts-portlet-default"
namespace="/help">
<action name="index"
- class="com.opensymphony.xwork2.ActionSupport">
+ class="org.apache.struts2.xwork2.ActionSupport">
<result name="success">/WEB-INF/help/index.jsp</result>
</action>
</package>
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-view.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-view.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-view.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/struts-view.xml Fri Dec 2 16:33:03 2011
@@ -7,7 +7,7 @@
<package name="view" extends="struts-portlet-default"
namespace="/view">
<action name="index"
- class="com.opensymphony.xwork2.ActionSupport">
+ class="org.apache.struts2.xwork2.ActionSupport">
<result name="success">/WEB-INF/view/index.jsp</result>
</action>
@@ -80,14 +80,14 @@
</action>
<action name="tokenExample"
- class="com.opensymphony.xwork2.ActionSupport" method="input">
+ class="org.apache.struts2.xwork2.ActionSupport" method="input">
<result name="input">
/WEB-INF/view/tokenExampleInput.jsp
</result>
</action>
<action name="processTokenExample"
- class="com.opensymphony.xwork2.ActionSupport">
+ class="org.apache.struts2.xwork2.ActionSupport">
<result name="input">
/WEB-INF/view/tokenExampleInput.jsp
</result>
@@ -107,7 +107,7 @@
</action>
<action name="freeMarkerExample"
- class="com.opensymphony.xwork2.ActionSupport" method="input">
+ class="org.apache.struts2.xwork2.ActionSupport" method="input">
<result type="freemarker" name="input">
/WEB-INF/view/freeMarkerExampleInput.ftl
</result>
@@ -122,7 +122,7 @@
<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
</action>
- <action name="velocityHelloWorld" class="com.opensymphony.xwork2.ActionSupport">
+ <action name="velocityHelloWorld" class="org.apache.struts2.xwork2.ActionSupport">
<result type="velocity" name="success">/WEB-INF/view/helloWorld.vm</result>
</action>
Modified: struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/validators.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/validators.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/portlet/src/main/resources/validators.xml Fri Dec 2 16:33:03 2011
@@ -3,15 +3,15 @@
"-//Apache Struts//XWork Validator Config 1.0//EN"
"http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
<validators>
- <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
- <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
- <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
- <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
- <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
- <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
- <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
- <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
- <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="required" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="org.apache.struts2.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="org.apache.struts2.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="org.apache.struts2.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="org.apache.struts2.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="org.apache.struts2.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="org.apache.struts2.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="org.apache.struts2.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="org.apache.struts2.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="org.apache.struts2.xwork2.validator.validators.ConversionErrorFieldValidator"/>
</validators>
Modified: struts/struts2/branches/STRUTS_3_X/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/rest-showcase/src/main/java/org/apache/struts2/rest/example/OrdersController.java Fri Dec 2 16:33:03 2011
@@ -2,24 +2,19 @@ package org.apache.struts2.rest.example;
import java.util.Collection;
-import org.apache.struts2.dispatcher.ServletActionRedirectResult;
import org.apache.struts2.rest.DefaultHttpHeaders;
import org.apache.struts2.rest.HttpHeaders;
import org.apache.struts2.convention.annotation.Results;
import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.ParentPackage;
-import org.apache.struts2.convention.annotation.Namespaces;
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.convention.annotation.InterceptorRef;
-
-import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.ValidationAwareSupport;
+
+import org.apache.struts2.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.Validateable;
+import org.apache.struts2.xwork2.ValidationAwareSupport;
@Results({
@Result(name="success", type="redirectAction", params = {"actionName" , "orders"})
})
-public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable{
+public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable {
private Order model = new Order();
private String id;
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java Fri Dec 2 16:33:03 2011
@@ -25,7 +25,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* <code>DateAction</code>
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java Fri Dec 2 16:33:03 2011
@@ -22,7 +22,7 @@ package org.apache.struts2.showcase;
import org.apache.struts2.showcase.ajax.tree.Category;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
//START SNIPPET: treeExampleDynamicJavaSelected
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java Fri Dec 2 16:33:03 2011
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.ArrayList;
-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/LotsOfRichtexteditorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;
-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/MoreSelectsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import java.util.List;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java Fri Dec 2 16:33:03 2011
@@ -22,7 +22,7 @@ package org.apache.struts2.showcase;
import org.apache.struts2.showcase.ajax.tree.Category;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class ShowAjaxDynamicTreeAction extends ActionSupport {
private int nodeId = 1;
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java Fri Dec 2 16:33:03 2011
@@ -22,7 +22,7 @@ package org.apache.struts2.showcase;
import org.apache.struts2.showcase.ajax.tree.Category;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
// START SNIPPET: treeExampleDynamicJavaShow
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java Fri Dec 2 16:33:03 2011
@@ -30,9 +30,9 @@ import java.util.Map;
import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Validateable;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import org.apache.log4j.Logger;
import org.apache.struts2.showcase.dao.Dao;
import org.apache.struts2.showcase.model.IdEntity;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* AbstractCRUDAction.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java Fri Dec 2 16:33:03 2011
@@ -32,7 +32,7 @@ import org.apache.struts2.showcase.dao.E
import org.apache.struts2.showcase.model.Employee;
import org.apache.struts2.showcase.model.Skill;
-import com.opensymphony.xwork2.Preparable;
+import org.apache.struts2.xwork2.Preparable;
/**
* JsfEmployeeAction.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class ExampleAction extends ActionSupport {
public static final String CONSTANT = "Struts Rocks!";
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java Fri Dec 2 16:33:03 2011
@@ -29,8 +29,8 @@ import java.net.URL;
import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.interceptor.annotations.After;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.interceptor.annotations.After;
/**
* Will only work on containers that unzip war files
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java Fri Dec 2 16:33:03 2011
@@ -25,7 +25,7 @@ import org.apache.struts2.showcase.dao.D
import org.apache.struts2.showcase.dao.SkillDao;
import org.apache.struts2.showcase.model.Skill;
-import com.opensymphony.xwork2.Preparable;
+import org.apache.struts2.xwork2.Preparable;
/**
* SkillAction.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.actionchaining;
-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/actionchaining/ActionChain2.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.actionchaining;
-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/actionchaining/ActionChain3.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.actionchaining;
-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/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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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/ajax/Example4ShowPanelAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.ajax
import java.text.SimpleDateFormat;
import java.util.Date;
-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/ajax/Example5Action.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class Example5Action extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.ajax.tree;
-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/chat/ChatAuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java Fri Dec 2 16:33:03 2011
@@ -23,12 +23,12 @@ package org.apache.struts2.showcase.chat
import org.apache.struts2.dispatcher.SessionMap;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
public class ChatAuthenticationInterceptor implements Interceptor {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java Fri Dec 2 16:33:03 2011
@@ -22,12 +22,12 @@ package org.apache.struts2.showcase.chat
import javax.servlet.http.HttpSession;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* Authenticate showcase chat example, make sure everyone have a username.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class ChatLoginAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class ChatLogoutAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java Fri Dec 2 16:33:03 2011
@@ -24,12 +24,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.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
public class ChatSessionListener implements HttpSessionListener {
private static final Logger LOG = LoggerFactory.getLogger(ChatSessionListener.class);
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.chat;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class CrudRoomAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java Fri Dec 2 16:33:03 2011
@@ -27,8 +27,8 @@ import java.util.Map;
import org.apache.struts2.util.StrutsTypeConverter;
-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;
public class DateConverter extends StrutsTypeConverter {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class EnterRoomAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class ExitRoomAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.chat
import java.util.ArrayList;
import java.util.List;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class MessagesAvailableInRoomAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.chat
import java.util.ArrayList;
import java.util.List;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class RoomsAvailableAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class SendMessageToRoomAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.chat
import java.util.ArrayList;
import java.util.List;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class UsersAvailableAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.chat
import java.util.ArrayList;
import java.util.List;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class UsersAvailableInRoomAction extends ActionSupport {
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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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/conversion/OperationsEnumAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-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/conversion/PersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java Fri Dec 2 16:33:03 2011
@@ -22,7 +22,7 @@ package org.apache.struts2.showcase.conv
import java.util.List;
-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/filedownload/FileDownloadAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.io.InputStream;
import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
/**
* Demonstrates file resource download.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java Fri Dec 2 16:33:03 2011
@@ -22,7 +22,7 @@ package org.apache.struts2.showcase.file
import java.io.File;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Show case File Upload example's action. <code>FileUploadAction</code>
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.file
import java.io.File;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Showcase action - mutiple file upload using array.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Showcase action - multiple file upload using List
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java Fri Dec 2 16:33:03 2011
@@ -26,8 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.freemarker.ScopesHashModel;
-import com.opensymphony.xwork2.ognl.OgnlValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* This is an example of a custom FreemarkerManager, mean to be
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.showcase.freemarker;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Preparable;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Preparable;
import java.text.DateFormatSymbols;
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class GetUpdatedHangmanAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java Fri Dec 2 16:33:03 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class GuessCharacterAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class StartHangmanAction extends ActionSupport implements SessionAware {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.showcase.modelDriven;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ModelDriven;
/**
* Action to demonstrate simple model-driven feature of the framework.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java Fri Dec 2 16:33:03 2011
@@ -24,10 +24,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.struts2.convention.annotation.ParentPackage;
import org.apache.struts2.convention.annotation.Result;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.Results;
/**
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java Fri Dec 2 16:33:03 2011
@@ -23,8 +23,7 @@ package org.apache.struts2.showcase.pers
import java.util.ArrayList;
import java.util.List;
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.Result;
@Result(location="list-people.ftl", type="freemarker")
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java Fri Dec 2 16:33:03 2011
@@ -20,11 +20,9 @@
*/
package org.apache.struts2.showcase.person;
-import org.apache.struts2.convention.annotation.ParentPackage;
import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.views.freemarker.FreemarkerResult;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
@Result(name="input", location="new-person.ftl", type="freemarker")
public class NewPersonAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java Fri Dec 2 16:33:03 2011
@@ -30,13 +30,12 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.util.ServletContextAware;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
/**
* Processes configuration, page, and action class paths to create snippets
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.tag.nonui.actionPrefix;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
public class SubmitAction extends ActionSupport {
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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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=1209569&r1=1209568&r2=1209569&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 Fri Dec 2 16:33:03 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/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.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/IteratorGeneratorTagDemo.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.tag.nonui.iteratortag;
-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/MergeIteratorTagDemo.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/MergeIteratorTagDemo.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java Fri Dec 2 16:33:03 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;
/**