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 12:25:26 UTC
svn commit: r1209415 [3/19] - 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/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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.validation;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.validation;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.validation;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.showcase.wait;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.showcase.xslt
import java.util.Map;
import java.util.Properties;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -8,7 +8,7 @@
<package name="integration" extends="struts1-default" namespace="/integration">
<interceptors>
- <interceptor name="gangsterForm" class="org.apache.struts2.xwork2.interceptor.ScopedModelDrivenInterceptor">
+ <interceptor name="gangsterForm" class="com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -8,10 +8,10 @@
// Calculate the view sources url
String sourceUrl = request.getContextPath()+"/viewSource.action";
- org.apache.struts2.xwork2.ActionInvocation inv = org.apache.struts2.xwork2.ActionContext.getContext().getActionInvocation();
+ com.opensymphony.xwork2.ActionInvocation inv = com.opensymphony.xwork2.ActionContext.getContext().getActionInvocation();
org.apache.struts2.dispatcher.mapper.ActionMapping mapping = org.apache.struts2.ServletActionContext.getActionMapping();
if (inv != null) {
- org.apache.struts2.xwork2.util.location.Location loc = inv.getProxy().getConfig().getLocation();
+ com.opensymphony.xwork2.util.location.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -10,7 +10,7 @@
<create creator="new" javascript="validator">
<param name="class" value="org.apache.struts2.validators.DWRValidator"/>
</create>
- <convert converter="bean" match="org.apache.struts2.xwork2.ValidationAwareSupport"/>
+ <convert converter="bean" match="com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -20,7 +20,7 @@ package org.apache.struts2.showcase.conv
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
* @version $Date$ $Id$
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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -19,8 +19,8 @@
package $package;
import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.Result;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
import javax.servlet.http.HttpServletResponse;
import java.io.Writer;
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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -8,7 +8,7 @@
<create creator="new" javascript="validator">
<param name="class" value="org.apache.struts2.validators.DWRValidator"/>
</create>
- <convert converter="bean" match="org.apache.struts2.xwork2.ValidationAwareSupport"/>
+ <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
</allow>
<signatures>
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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -36,7 +36,7 @@
<instructions>
<manifestLocation>META-INF</manifestLocation>
<Struts2-Enabled>true</Struts2-Enabled>
- <Import-Package>*,org.apache.struts2.xwork2</Import-Package>
+ <Import-Package>*,com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,13 +21,14 @@
package org.apache.struts2.osgi.admin.actions;
-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 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.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;
@@ -39,6 +40,10 @@ 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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -28,8 +28,8 @@ import org.apache.struts2.osgi.DefaultBu
import org.apache.felix.shell.ShellService;
import org.osgi.framework.ServiceReference;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -71,7 +71,7 @@
<configuration>
<instructions>
<manifestLocation>META-INF</manifestLocation>
- <Import-Package>*,org.apache.struts2.xwork2</Import-Package>
+ <Import-Package>*,com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -23,9 +23,12 @@ package actions.osgi;
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 org.apache.struts2.xwork2.ActionSupport;
+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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -1,8 +1,13 @@
package actions.osgi;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.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/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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -30,8 +30,8 @@ import javax.servlet.jsp.PageContext;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -197,22 +197,22 @@ public final class StrutsConstants {
/** The com.opensymphony.xwork2.validator.ActionValidatorManager implementation class */
public static final String STRUTS_ACTIONVALIDATORMANAGER = "struts.actionValidatorManager";
- /** The {@link org.apache.struts2.xwork2.util.ValueStackFactory} implementation class */
+ /** The {@link com.opensymphony.xwork2.util.ValueStackFactory} implementation class */
public static final String STRUTS_VALUESTACKFACTORY = "struts.valueStackFactory";
- /** The {@link org.apache.struts2.xwork2.util.reflection.ReflectionProvider} implementation class */
+ /** The {@link com.opensymphony.xwork2.util.reflection.ReflectionProvider} implementation class */
public static final String STRUTS_REFLECTIONPROVIDER = "struts.reflectionProvider";
- /** The {@link org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory} implementation class */
+ /** The {@link com.opensymphony.xwork2.util.reflection.ReflectionContextFactory} implementation class */
public static final String STRUTS_REFLECTIONCONTEXTFACTORY = "struts.reflectionContextFactory";
- /** The {@link org.apache.struts2.xwork2.util.PatternMatcher} implementation class */
+ /** The {@link com.opensymphony.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 org.apache.struts2.xwork2.UnknownHandlerManager} implementation class */
+ /** The {@link com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,8 +21,8 @@
package org.apache.struts2;
-import org.apache.struts2.xwork2.XWorkException;
-import org.apache.struts2.xwork2.util.location.Locatable;
+import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.util.location.Locatable;
/**
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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionProxy;
-import org.apache.struts2.xwork2.ActionProxyFactory;
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.ValueStackFactory;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+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;
/**
* <!-- 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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,10 +21,10 @@
package org.apache.struts2.components;
-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 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.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,13 +26,13 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-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;
+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;
/**
* <!-- 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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -23,7 +23,7 @@ package org.apache.struts2.components;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,11 +21,11 @@
package org.apache.struts2.components;
-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 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.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -21,18 +21,19 @@
package org.apache.struts2.components;
-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 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.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.util.ContainUtil;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -29,16 +29,16 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsException;
-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;
+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;
/**
* <!-- 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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 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 com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: 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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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=1209415&r1=1209414&r2=1209415&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 11:24:48 2011
@@ -32,7 +32,7 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.util.ContainUtil;
import org.apache.struts2.util.MakeIterator;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* DoubleListUIBean is the standard superclass of all Struts list handling components.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/MergeIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/MergeIterator.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/MergeIterator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/MergeIterator.java Fri Dec 2 11:24:48 2011
@@ -32,9 +32,9 @@ import org.apache.struts2.util.MergeIter
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptGroup.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptGroup.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptGroup.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptGroup.java Fri Dec 2 11:24:48 2011
@@ -31,11 +31,11 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java Fri Dec 2 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Param.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Param.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Param.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Param.java Fri Dec 2 11:24:48 2011
@@ -27,7 +27,7 @@ import org.apache.struts2.views.annotati
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsException;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Password.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Password.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Password.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Password.java Fri Dec 2 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Property.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Property.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Property.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Property.java Fri Dec 2 11:24:48 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringEscapeUtils;
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/Push.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Push.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Push.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Push.java Fri Dec 2 11:24:48 2011
@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Radio.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Radio.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Radio.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Radio.java Fri Dec 2 11:24:48 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Reset.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Reset.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Reset.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Reset.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
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/Select.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Select.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Select.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Select.java Fri Dec 2 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java Fri Dec 2 11:24:48 2011
@@ -21,12 +21,12 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Set.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Set.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Set.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Set.java Fri Dec 2 11:24:48 2011
@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Submit.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Submit.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Submit.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Submit.java Fri Dec 2 11:24:48 2011
@@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Text.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Text.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Text.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Text.java Fri Dec 2 11:24:48 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.util.TextProviderHelper;
import org.apache.struts2.views.annotations.StrutsTag;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextArea.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextArea.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextArea.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextArea.java Fri Dec 2 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextField.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextField.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextField.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/TextField.java Fri Dec 2 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Token.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Token.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Token.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/Token.java Fri Dec 2 11:24:48 2011
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.util.TokenHelper;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UIBean.java Fri Dec 2 11:24:48 2011
@@ -41,11 +41,11 @@ import org.apache.struts2.components.tem
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.util.ContextUtil;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-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 com.opensymphony.xwork2.config.ConfigurationException;
+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;
/**
* UIBean is the standard superclass of all Struts UI componentns.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/URL.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/URL.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/URL.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/URL.java Fri Dec 2 11:24:48 2011
@@ -30,10 +30,10 @@ import org.apache.struts2.StrutsConstant
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-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 com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UpDownSelect.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UpDownSelect.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UpDownSelect.java Fri Dec 2 11:24:48 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 org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UrlProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UrlProvider.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UrlProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/UrlProvider.java Fri Dec 2 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.components;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.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/template/BaseTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java Fri Dec 2 11:24:48 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.components.template;
-import org.apache.struts2.xwork2.util.ClassLoaderUtil;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java Fri Dec 2 11:24:48 2011
@@ -33,13 +33,13 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.freemarker.FreemarkerManager;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionInvocation;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.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 com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+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 freemarker.template.Configuration;
import freemarker.template.SimpleHash;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java Fri Dec 2 11:24:48 2011
@@ -23,18 +23,19 @@ package org.apache.struts2.components.te
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.inject.Inject;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.components.Include;
import org.apache.struts2.components.UIBean;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* JSP based template engine.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java Fri Dec 2 11:24:48 2011
@@ -26,9 +26,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
/**
* The TemplateEngineManager will return a template engine for the template
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java Fri Dec 2 11:24:48 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.struts2.components.UIBean;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
/**
* Context used when rendering templates.