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 [3/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/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.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/SubsetIteratorTagDemo.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/SubsetIteratorTagDemo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.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/token/TokenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java Fri Dec 2 16:33:03 2011
@@ -22,8 +22,8 @@ package org.apache.struts2.showcase.toke
import java.util.Date;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Example to illustrate the <code>token</code> and <code>tokenSession</code> interceptor.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.validation;
-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/validation/QuizAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.validation;
-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/validation/SubmitApplication.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.validation;
-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/wait/LongProcessAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.wait;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Example to illustrate the <code>execAndWait</code> interceptor.
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.xslt
import java.util.Map;
import java.util.Properties;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.interceptor.ServletRequestAware;
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/resources/struts-integration.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/resources/struts-integration.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/resources/struts-integration.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/resources/struts-integration.xml Fri Dec 2 16:33:03 2011
@@ -8,7 +8,7 @@
<package name="integration" extends="struts1-default" namespace="/integration">
<interceptors>
- <interceptor name="gangsterForm" class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor">
+ <interceptor name="gangsterForm" class="org.apache.struts2.xwork2.interceptor.ScopedModelDrivenInterceptor">
<param name="className">org.apache.struts2.showcase.integration.GangsterForm</param>
<param name="name">gangsterForm</param>
</interceptor>
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp Fri Dec 2 16:33:03 2011
@@ -1,3 +1,6 @@
+<%@ page import="org.apache.struts2.xwork2.ActionInvocation" %>
+<%@ page import="org.apache.struts2.xwork2.util.location.Location" %>
+<%@ page import="org.apache.struts2.xwork2.ActionContext" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -8,10 +11,10 @@
// Calculate the view sources url
String sourceUrl = request.getContextPath()+"/viewSource.action";
- com.opensymphony.xwork2.ActionInvocation inv = com.opensymphony.xwork2.ActionContext.getContext().getActionInvocation();
+ ActionInvocation inv = ActionContext.getContext().getActionInvocation();
org.apache.struts2.dispatcher.mapper.ActionMapping mapping = org.apache.struts2.ServletActionContext.getActionMapping();
if (inv != null) {
- com.opensymphony.xwork2.util.location.Location loc = inv.getProxy().getConfig().getLocation();
+ Location loc = inv.getProxy().getConfig().getLocation();
sourceUrl += "?config="+(loc != null ? loc.getURI()+":"+loc.getLineNumber() : "");
sourceUrl += "&className="+inv.getProxy().getConfig().getClassName();
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/dwr.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/WEB-INF/dwr.xml Fri Dec 2 16:33:03 2011
@@ -10,7 +10,7 @@
<create creator="new" javascript="validator">
<param name="class" value="org.apache.struts2.validators.DWRValidator"/>
</create>
- <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
+ <convert converter="bean" match="org.apache.struts2.xwork2.ValidationAwareSupport"/>
</allow>
<signatures>
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/AddressAction.java.txt Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@ package org.apache.struts2.showcase.conv
import java.util.LinkedHashSet;
import java.util.Set;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* @version $Date$ $Id$
Modified: struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/OperationsEnumAction.java.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/OperationsEnumAction.java.txt?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/OperationsEnumAction.java.txt (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/OperationsEnumAction.java.txt Fri Dec 2 16:33:03 2011
@@ -21,7 +21,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/webapp/conversion/PersonAction.java.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt Fri Dec 2 16:33:03 2011
@@ -19,7 +19,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/webapp/interactive/example-action.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/interactive/example-action.jsp?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/interactive/example-action.jsp (original)
+++ struts/struts2/branches/STRUTS_3_X/apps/showcase/src/main/webapp/interactive/example-action.jsp Fri Dec 2 16:33:03 2011
@@ -13,7 +13,7 @@
<span class="kw">import</span> java.util.List;
<span class="kw">import</span> java.util.Map;
-<span class="kw">import</span> com.opensymphony.xwork2.ActionSupport;
+<span class="kw">import</span> org.apache.struts2.xwork2.ActionSupport;
<span class="kw">public class</span> ExampleAction <span class="kw">extends</span> ActionSupport {
<span class="kw">public static final</span> String CONSTANT = "Struts Rocks!";
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package ${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/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java Fri Dec 2 16:33:03 2011
@@ -21,11 +21,11 @@
package ${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 java.util.Map;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package ${package}.example;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.StrutsTestCase;
public class HelloWorldTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java Fri Dec 2 16:33:03 2011
@@ -21,8 +21,8 @@
package ${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/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java Fri Dec 2 16:33:03 2011
@@ -1,6 +1,6 @@
package ${package}.actions;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* <code>Set welcome message.</code>
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/Index.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/Index.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/Index.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/java/actions/Index.java Fri Dec 2 16:33:03 2011
@@ -1,7 +1,7 @@
package ${package}.actions;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java Fri Dec 2 16:33:03 2011
@@ -1,6 +1,6 @@
package ${package}.actions;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.StrutsTestCase;
public class HelloActionTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java Fri Dec 2 16:33:03 2011
@@ -1,6 +1,6 @@
package ${package}.actions;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.StrutsTestCase;
public class IndexTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java Fri Dec 2 16:33:03 2011
@@ -19,8 +19,8 @@
package $package;
import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Result;
import javax.servlet.http.HttpServletResponse;
import java.io.Writer;
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml Fri Dec 2 16:33:03 2011
@@ -11,7 +11,7 @@
This is an example of a bean that provides a new ObjectFactory:
- <bean type="com.opensymphony.xwork2.ObjectFactory" name="myObjectFactory" class="com.mycompany.myapp.MyObjectFactory" />
+ <bean type="org.apache.struts2.xwork2.ObjectFactory" name="myObjectFactory" class="com.mycompany.myapp.MyObjectFactory" />
This example adds a new template engine for the Struts UI tags:
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/java/HelloAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/java/HelloAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/java/HelloAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/java/HelloAction.java Fri Dec 2 16:33:03 2011
@@ -5,7 +5,7 @@ import javax.portlet.PortletPreferences;
import org.apache.struts2.dispatcher.DefaultActionSupport;
import org.apache.struts2.portlet.interceptor.PortletPreferencesAware;
-import com.opensymphony.xwork2.Preparable;
+import org.apache.struts2.xwork2.Preparable;
public class HelloAction extends DefaultActionSupport implements PortletPreferencesAware {
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@ import java.text.SimpleDateFormat;
import java.text.ParseException;
import java.util.Map;
import java.util.Date;
-import com.opensymphony.xwork2.conversion.TypeConversionException;
+import org.apache.struts2.xwork2.conversion.TypeConversionException;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java Fri Dec 2 16:33:03 2011
@@ -16,12 +16,12 @@
package ${package};
import java.util.Date;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.validator.annotations.Validation;
-import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
-import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
-import com.opensymphony.xwork2.conversion.annotations.Conversion;
-import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.validator.annotations.Validation;
+import org.apache.struts2.xwork2.validator.annotations.RequiredStringValidator;
+import org.apache.struts2.xwork2.validator.annotations.RequiredFieldValidator;
+import org.apache.struts2.xwork2.conversion.annotations.Conversion;
+import org.apache.struts2.xwork2.conversion.annotations.TypeConversion;
@Validation()
@Conversion()
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java Fri Dec 2 16:33:03 2011
@@ -15,10 +15,10 @@
*/
package ${package};
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import java.util.Date;
-import com.opensymphony.xwork2.conversion.annotations.Conversion;
-import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
+import org.apache.struts2.xwork2.conversion.annotations.Conversion;
+import org.apache.struts2.xwork2.conversion.annotations.TypeConversion;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties Fri Dec 2 16:33:03 2011
@@ -15,7 +15,7 @@ struts.i18n.encoding=UTF-8
### if specified, the default object factory can be overridden here
### Note: short-hand notation is supported in some cases, such as "spring"
-### Alternatively, you can provide a com.opensymphony.xwork2.ObjectFactory subclass name here
+### Alternatively, you can provide a org.apache.struts2.xwork2.ObjectFactory subclass name here
struts.objectFactory = spring
### specifies the autoWiring logic when using the SpringObjectFactory.
@@ -30,7 +30,7 @@ struts.objectFactory.spring.useClassCach
### if specified, the default object type determiner can be overridden here
### Note: short-hand notation is supported in some cases, such as "tiger" or "notiger"
-### Alternatively, you can provide a com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
+### Alternatively, you can provide a org.apache.struts2.xwork2.util.ObjectTypeDeterminer implementation name here
### Note: if you have the xwork2-tiger.jar within your classpath, GenericsObjectTypeDeterminer is used by default
### To disable tiger support use the "notiger" property value here.
#struts.objectTypeDeterminer = tiger
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml Fri Dec 2 16:33:03 2011
@@ -8,7 +8,7 @@
<create creator="new" javascript="validator">
<param name="class" value="org.apache.struts2.validators.DWRValidator"/>
</create>
- <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
+ <convert converter="bean" match="org.apache.struts2.xwork2.ValidationAwareSupport"/>
</allow>
<signatures>
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java Fri Dec 2 16:33:03 2011
@@ -17,7 +17,7 @@ package ${package};
import junit.framework.TestCase;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java Fri Dec 2 16:33:03 2011
@@ -17,7 +17,7 @@ package ${package};
import junit.framework.TestCase;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/bundles/admin/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/bundles/admin/pom.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/bundles/admin/pom.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/bundles/admin/pom.xml Fri Dec 2 16:33:03 2011
@@ -36,7 +36,7 @@
<instructions>
<manifestLocation>META-INF</manifestLocation>
<Struts2-Enabled>true</Struts2-Enabled>
- <Import-Package>*,com.opensymphony.xwork2</Import-Package>
+ <Import-Package>*,org.apache.struts2.xwork2</Import-Package>
<Export-Package>org.apache.struts2.osgi.admin*</Export-Package>
<Spring-Context>*;create-asynchronously:=false</Spring-Context>
</instructions>
Modified: struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java Fri Dec 2 16:33:03 2011
@@ -21,14 +21,13 @@
package org.apache.struts2.osgi.admin.actions;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.inject.Inject;
import org.apache.struts2.osgi.BundleAccessor;
import org.apache.struts2.osgi.OsgiHost;
import org.apache.struts2.osgi.StrutsOsgiListener;
-import org.apache.struts2.osgi.OsgiConfigurationProvider;
import org.apache.struts2.util.ServletContextAware;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
@@ -40,10 +39,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Enumeration;
-import java.util.Dictionary;
public class BundlesAction extends ActionSupport implements ServletContextAware {
Modified: struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/ShellAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/ShellAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/ShellAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/ShellAction.java Fri Dec 2 16:33:03 2011
@@ -26,11 +26,10 @@ import java.io.PrintStream;
import org.apache.struts2.osgi.DefaultBundleAccessor;
import org.apache.felix.shell.ShellService;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
import org.osgi.framework.ServiceReference;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
/**
* This action executes commands on the Felix Shell
*/
Modified: struts/struts2/branches/STRUTS_3_X/bundles/demo/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/bundles/demo/pom.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/bundles/demo/pom.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/bundles/demo/pom.xml Fri Dec 2 16:33:03 2011
@@ -71,7 +71,7 @@
<configuration>
<instructions>
<manifestLocation>META-INF</manifestLocation>
- <Import-Package>*,com.opensymphony.xwork2</Import-Package>
+ <Import-Package>*,org.apache.struts2.xwork2</Import-Package>
<Spring-Context>*;create-asynchronously:=false</Spring-Context>
<Struts2-Enabled>true</Struts2-Enabled>
</instructions>
Modified: struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/BundlesAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/BundlesAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/BundlesAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/BundlesAction.java Fri Dec 2 16:33:03 2011
@@ -20,16 +20,12 @@
*/
package actions.osgi;
+import org.apache.struts2.xwork2.ActionSupport;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
import org.apache.struts2.osgi.interceptor.BundleContextAware;
-import org.apache.struts2.osgi.interceptor.ServiceAware;
import org.apache.struts2.convention.annotation.ResultPath;
-import java.util.List;
-
-import com.opensymphony.xwork2.ActionSupport;
-
/**
* This action shows how to interact with the OSGi container, using the OSGi interceptor
*/
Modified: struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java Fri Dec 2 16:33:03 2011
@@ -1,13 +1,8 @@
package actions.osgi;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
import org.apache.struts2.convention.annotation.Action;
import org.apache.struts2.convention.annotation.ResultPath;
-import org.apache.struts2.osgi.interceptor.BundleContextAware;
-import org.apache.struts2.osgi.interceptor.ServiceAware;
-import org.osgi.framework.BundleContext;
-
-import java.util.List;
@ResultPath("/content")
public class HelloWorldAction extends ActionSupport {
Modified: struts/struts2/branches/STRUTS_3_X/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/pom.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/core/pom.xml Fri Dec 2 16:33:03 2011
@@ -131,7 +131,7 @@
</group>
<group>
<title>XWork Packages</title>
- <packages>com.opensymphony.xwork2*</packages>
+ <packages>org.apache.struts2.xwork2*</packages>
</group>
</groups>
<show>private</show>
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/ServletActionContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/ServletActionContext.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/ServletActionContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/ServletActionContext.java Fri Dec 2 16:33:03 2011
@@ -30,8 +30,8 @@ import javax.servlet.jsp.PageContext;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsConstants.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsConstants.java Fri Dec 2 16:33:03 2011
@@ -61,10 +61,10 @@ public final class StrutsConstants {
public static final String STRUTS_URL_RENDERER = "struts.urlRenderer";
- /** The com.opensymphony.xwork2.ObjectFactory implementation class */
+ /** The org.apache.struts2.xwork2.ObjectFactory implementation class */
public static final String STRUTS_OBJECTFACTORY = "struts.objectFactory";
- /** The com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation class */
+ /** The org.apache.struts2.xwork2.util.ObjectTypeDeterminer implementation class */
public static final String STRUTS_OBJECTTYPEDETERMINER = "struts.objectTypeDeterminer";
/** The package containing actions that use Rife continuations */
@@ -194,25 +194,25 @@ public final class StrutsConstants {
/** The name of the parameter to determine whether static method access will be allowed in OGNL expressions or not */
public static final String STRUTS_ALLOW_STATIC_METHOD_ACCESS = "struts.ognl.allowStaticMethodAccess";
- /** The com.opensymphony.xwork2.validator.ActionValidatorManager implementation class */
+ /** The org.apache.struts2.xwork2.validator.ActionValidatorManager implementation class */
public static final String STRUTS_ACTIONVALIDATORMANAGER = "struts.actionValidatorManager";
- /** The {@link com.opensymphony.xwork2.util.ValueStackFactory} implementation class */
+ /** The {@link org.apache.struts2.xwork2.util.ValueStackFactory} implementation class */
public static final String STRUTS_VALUESTACKFACTORY = "struts.valueStackFactory";
- /** The {@link com.opensymphony.xwork2.util.reflection.ReflectionProvider} implementation class */
+ /** The {@link org.apache.struts2.xwork2.util.reflection.ReflectionProvider} implementation class */
public static final String STRUTS_REFLECTIONPROVIDER = "struts.reflectionProvider";
- /** The {@link com.opensymphony.xwork2.util.reflection.ReflectionContextFactory} implementation class */
+ /** The {@link org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory} implementation class */
public static final String STRUTS_REFLECTIONCONTEXTFACTORY = "struts.reflectionContextFactory";
- /** The {@link com.opensymphony.xwork2.util.PatternMatcher} implementation class */
+ /** The {@link org.apache.struts2.xwork2.util.PatternMatcher} implementation class */
public static final String STRUTS_PATTERNMATCHER = "struts.patternMatcher";
/** The {@link org.apache.struts2.dispatcher.StaticContentLoader} implementation class */
public static final String STRUTS_STATIC_CONTENT_LOADER = "struts.staticContentLoader";
- /** The {@link com.opensymphony.xwork2.UnknownHandlerManager} implementation class */
+ /** The {@link org.apache.struts2.xwork2.UnknownHandlerManager} implementation class */
public static final String STRUTS_UNKNOWN_HANDLER_MANAGER = "struts.unknownHandlerManager";
/** Throw RuntimeException when a property is not found, or the evaluation of the espression fails*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsException.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsException.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsException.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsException.java Fri Dec 2 16:33:03 2011
@@ -21,8 +21,8 @@
package org.apache.struts2;
-import com.opensymphony.xwork2.XWorkException;
-import com.opensymphony.xwork2.util.location.Locatable;
+import org.apache.struts2.xwork2.XWorkException;
+import org.apache.struts2.xwork2.util.location.Locatable;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsStatics.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsStatics.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsStatics.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/StrutsStatics.java Fri Dec 2 16:33:03 2011
@@ -42,27 +42,27 @@ public interface StrutsStatics {
/**
* Constant for the HTTP request object.
*/
- public static final String HTTP_REQUEST = "com.opensymphony.xwork2.dispatcher.HttpServletRequest";
+ public static final String HTTP_REQUEST = "org.apache.struts2.xwork2.dispatcher.HttpServletRequest";
/**
* Constant for the HTTP response object.
*/
- public static final String HTTP_RESPONSE = "com.opensymphony.xwork2.dispatcher.HttpServletResponse";
+ public static final String HTTP_RESPONSE = "org.apache.struts2.xwork2.dispatcher.HttpServletResponse";
/**
* Constant for an HTTP {@link javax.servlet.RequestDispatcher request dispatcher}.
*/
- public static final String SERVLET_DISPATCHER = "com.opensymphony.xwork2.dispatcher.ServletDispatcher";
+ public static final String SERVLET_DISPATCHER = "org.apache.struts2.xwork2.dispatcher.ServletDispatcher";
/**
* Constant for the {@link javax.servlet.ServletContext servlet context} object.
*/
- public static final String SERVLET_CONTEXT = "com.opensymphony.xwork2.dispatcher.ServletContext";
+ public static final String SERVLET_CONTEXT = "org.apache.struts2.xwork2.dispatcher.ServletContext";
/**
* Constant for the JSP {@link javax.servlet.jsp.PageContext page context}.
*/
- public static final String PAGE_CONTEXT = "com.opensymphony.xwork2.dispatcher.PageContext";
+ public static final String PAGE_CONTEXT = "org.apache.struts2.xwork2.dispatcher.PageContext";
/** Constant for the PortletContext object */
public static final String STRUTS_PORTLET_CONTEXT = "struts.portlet.context";
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionComponent.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionComponent.java Fri Dec 2 16:33:03 2011
@@ -43,15 +43,15 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.TagUtils;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-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.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionError.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionError.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionError.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionError.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionMessage.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionMessage.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionMessage.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ActionMessage.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Anchor.java Fri Dec 2 16:33:03 2011
@@ -21,10 +21,10 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/AppendIterator.java Fri Dec 2 16:33:03 2011
@@ -32,9 +32,9 @@ import org.apache.struts2.util.MakeItera
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Bean.java Fri Dec 2 16:33:03 2011
@@ -26,13 +26,13 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Checkbox.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Checkbox.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Checkbox.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Checkbox.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/CheckboxList.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/CheckboxList.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/CheckboxList.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/CheckboxList.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java Fri Dec 2 16:33:03 2011
@@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* ClosingUIBean is the standard superclass for UI components such as div etc.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComboBox.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComboBox.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComboBox.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComboBox.java Fri Dec 2 16:33:03 2011
@@ -32,7 +32,7 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.util.MakeIterator;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Component.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Component.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Component.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Component.java Fri Dec 2 16:33:03 2011
@@ -41,9 +41,9 @@ import org.apache.struts2.views.jsp.TagU
import org.apache.struts2.views.util.ContextUtil;
import org.apache.struts2.views.util.UrlHelper;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.TextParseUtil;
/**
* Base class to extend for UI components.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ContextBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ContextBean.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ContextBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ContextBean.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.components;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* Base class for control and data tags
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Date.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Date.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Date.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Date.java Fri Dec 2 16:33:03 2011
@@ -21,11 +21,11 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProvider;
-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.ActionContext;
+import org.apache.struts2.xwork2.TextProvider;
+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.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Debug.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Debug.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Debug.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Debug.java Fri Dec 2 16:33:03 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Div.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Div.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Div.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Div.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* DoubleListUIBean is the standard superclass of all Struts double list handling components.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleSelect.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleSelect.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/DoubleSelect.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.views.annotations.StrutsTag;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Else.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Else.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Else.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Else.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.struts2.views.annotations.StrutsTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ElseIf.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ElseIf.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ElseIf.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FieldError.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FieldError.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FieldError.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FieldError.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.components.Param.UnnamedParametric;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/File.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/File.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/File.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/File.java Fri Dec 2 16:33:03 2011
@@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Form.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Form.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Form.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Form.java Fri Dec 2 16:33:03 2011
@@ -21,19 +21,18 @@
package org.apache.struts2.components;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.MethodFilterInterceptorUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.ActionValidatorManager;
-import com.opensymphony.xwork2.validator.FieldValidator;
-import com.opensymphony.xwork2.validator.ValidationInterceptor;
-import com.opensymphony.xwork2.validator.Validator;
-import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.RuntimeConfiguration;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.interceptor.MethodFilterInterceptorUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.ActionValidatorManager;
+import org.apache.struts2.xwork2.validator.FieldValidator;
+import org.apache.struts2.xwork2.validator.ValidationInterceptor;
+import org.apache.struts2.xwork2.validator.Validator;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.commons.lang.StringUtils;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FormButton.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FormButton.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FormButton.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/FormButton.java Fri Dec 2 16:33:03 2011
@@ -28,8 +28,8 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.inject.Inject;
/**
* FormButton.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/GenericUIBean.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/GenericUIBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/GenericUIBean.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.util.ContainUtil;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Head.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Head.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Head.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Head.java Fri Dec 2 16:33:03 2011
@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Hidden.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Hidden.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Hidden.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Hidden.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/I18n.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/I18n.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/I18n.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/I18n.java Fri Dec 2 16:33:03 2011
@@ -29,16 +29,16 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsException;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.TextProviderFactory;
-import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-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.ActionContext;
+import org.apache.struts2.xwork2.LocaleProvider;
+import org.apache.struts2.xwork2.TextProviderFactory;
+import org.apache.struts2.xwork2.TextProvider;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/If.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/If.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/If.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/If.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Include.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Include.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Include.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Include.java Fri Dec 2 16:33:03 2011
@@ -47,10 +47,10 @@ import org.apache.struts2.util.FastByteA
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java Fri Dec 2 16:33:03 2011
@@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/IteratorComponent.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/IteratorComponent.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/IteratorComponent.java Fri Dec 2 16:33:03 2011
@@ -31,9 +31,9 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.util.MakeIterator;
import org.apache.struts2.views.jsp.IteratorStatus;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Label.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Label.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Label.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Label.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.util.TextProviderHelper;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ListUIBean.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ListUIBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ListUIBean.java Fri Dec 2 16:33:03 2011
@@ -32,7 +32,7 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.util.ContainUtil;
import org.apache.struts2.util.MakeIterator;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* DoubleListUIBean is the standard superclass of all Struts list handling components.