struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r420385 [3/6] - in /struts/struts2/trunk: apps/ apps/blank/src/main/java/org/apache/struts2/example/ apps/portlet/src/main/java/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portlet/src/main/java/org/apache/struts2/po...
Date Mon, 10 Jul 2006 00:57:21 GMT
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/WebTable.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/WebTable.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/WebTable.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/WebTable.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.components.GenericUIBean;
 import org.apache.struts2.components.table.renderer.CellRenderer;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java Sun Jul  9 17:57:05 2006
@@ -19,9 +19,9 @@
 
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import com.opensymphony.util.ClassLoaderUtil;
 import freemarker.template.Configuration;
 import freemarker.template.SimpleHash;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java Sun Jul  9 17:57:05 2006
@@ -20,7 +20,7 @@
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.components.Include;
 import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.components.template;
 
 import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import java.io.Writer;
 import java.util.Map;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.config;
 
-import com.opensymphony.xwork.ObjectFactory;
+import com.opensymphony.xwork2.ObjectFactory;
 import org.apache.struts2.StrutsConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.config;
 
-import com.opensymphony.xwork.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import org.apache.struts2.StrutsConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java Sun Jul  9 17:57:05 2006
@@ -17,8 +17,8 @@
  */
 package org.apache.struts2.config_browser;
 
-import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.xwork.config.entities.ActionConfig;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
 import org.apache.struts2.config.Configuration;
 import org.apache.struts2.StrutsConstants;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.config_browser;
 
-import com.opensymphony.xwork.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
 
 import java.util.Collections;
 import java.util.Map;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java Sun Jul  9 17:57:05 2006
@@ -17,9 +17,9 @@
  */
 package org.apache.struts2.config_browser;
 
-import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.validator.ActionValidatorManagerFactory;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
 import org.apache.struts2.util.ClassLoaderUtils;
 
 import java.util.Collections;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java Sun Jul  9 17:57:05 2006
@@ -17,8 +17,8 @@
  */
 package org.apache.struts2.config_browser;
 
-import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.config.entities.ActionConfig;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
 import ognl.OgnlRuntime;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java Sun Jul  9 17:57:05 2006
@@ -17,8 +17,8 @@
  */
 package org.apache.struts2.config_browser;
 
-import com.opensymphony.xwork.util.OgnlUtil;
-import com.opensymphony.xwork.validator.Validator;
+import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.validator.Validator;
 import ognl.Ognl;
 import ognl.OgnlException;
 import org.apache.commons.logging.Log;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.dispatcher;
 
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * A simple action support class that sets properties to be able to serve 
@@ -39,7 +39,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see com.opensymphony.xwork.ActionSupport#execute()
+	 * @see com.opensymphony.xwork2.ActionSupport#execute()
 	 */
 	public String execute() throws Exception {
 		HttpServletRequest request = ServletActionContext.getRequest();

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java Sun Jul  9 17:57:05 2006
@@ -29,13 +29,13 @@
 import org.apache.struts2.util.AttributeMap;
 import org.apache.struts2.util.ObjectFactoryDestroyable;
 import org.apache.struts2.util.ObjectFactoryInitializable;
-import com.opensymphony.xwork.*;
-import com.opensymphony.xwork.config.ConfigurationException;
-import com.opensymphony.xwork.config.ConfigurationManager;
-import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork.util.*;
-import com.opensymphony.xwork.util.location.Location;
-import com.opensymphony.xwork.util.location.LocationUtils;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.util.*;
+import com.opensymphony.xwork2.util.location.Location;
+import com.opensymphony.xwork2.util.location.LocationUtils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -158,10 +158,10 @@
             if (className.equals("tiger")) {
                 // note: this class name needs to be in string form so we don't put hard
                 //       dependencies on xwork-tiger, since it isn't technically required.
-                className = "com.opensymphony.xwork.util.GenericsObjectTypeDeterminer";
+                className = "com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer";
             }
             else if (className.equals("notiger")) {
-                className = "com.opensymphony.xwork.util.DefaultObjectTypeDeterminer";
+                className = "com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer";
             }
 
             try {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Sun Jul  9 17:57:05 2006
@@ -25,7 +25,7 @@
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java Sun Jul  9 17:57:05 2006
@@ -18,11 +18,11 @@
 package org.apache.struts2.dispatcher;
 
 import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Result;
-import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.xwork.util.TextParseUtil;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.TextParseUtil;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java Sun Jul  9 17:57:05 2006
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionInvocation;
 
 /**
  * <!-- START SNIPPET: description -->

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java Sun Jul  9 17:57:05 2006
@@ -24,7 +24,7 @@
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.views.util.UrlHelper;
 
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionInvocation;
 
 /**
  * <!-- START SNIPPET: description -->

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.dispatcher;
 
 import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java Sun Jul  9 17:57:05 2006
@@ -19,8 +19,8 @@
 
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.dispatcher;
 
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionInvocation;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java Sun Jul  9 17:57:05 2006
@@ -17,8 +17,8 @@
  */
 package org.apache.struts2.dispatcher;
 
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java Sun Jul  9 17:57:05 2006
@@ -23,9 +23,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsStatics;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Result;
-import com.opensymphony.xwork.util.TextParseUtil;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.util.TextParseUtil;
 
 
 /**
@@ -38,7 +38,7 @@
  * <ul>
  * <li>location - the location to go to after execution (could be a jsp page or another action).
  * It can be parsed as per the rules definied in the
- * {@link TextParseUtil#translateVariables(java.lang.String, com.opensymphony.xwork.util.OgnlValueStack) translateVariables}
+ * {@link TextParseUtil#translateVariables(java.lang.String, com.opensymphony.xwork2.util.OgnlValueStack) translateVariables}
  * method</li>
  * <li>parse - true by default. If set to false, the location param will not be parsed for expressions</li>
  * <li>encode - false by default. If set to false, the location param will not be url encoded. This only have effect when parse is true</li>
@@ -90,11 +90,11 @@
  *      &lt;result-type name="myresult" class="com.foo.MyResult" /&gt;
  *  &lt;/result-types&gt;</pre>
  * <p/>
- * Please see the {@link com.opensymphony.xwork.Result} class for more info on Results in general.
+ * Please see the {@link com.opensymphony.xwork2.Result} class for more info on Results in general.
  *
  * <!-- END SNIPPET: example -->
  * 
- * @see com.opensymphony.xwork.Result
+ * @see com.opensymphony.xwork2.Result
  */
 public abstract class StrutsResultSupport implements Result, StrutsStatics {
 	

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java Sun Jul  9 17:57:05 2006
@@ -22,9 +22,9 @@
 import org.apache.struts2.config.Configuration;
 import org.apache.struts2.views.JspSupportServlet;
 import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.Template;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.config.Configuration;
 import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork.ObjectFactory;
+import com.opensymphony.xwork2.ObjectFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.dispatcher.mapper;
 
-import com.opensymphony.xwork.Result;
+import com.opensymphony.xwork2.Result;
 
 import java.util.Map;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.interceptor;
 
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionInvocation;
 
 import java.io.Serializable;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java Sun Jul  9 17:57:05 2006
@@ -21,8 +21,8 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 
 /**
  * <!-- START SNIPPET: description -->

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java Sun Jul  9 17:57:05 2006
@@ -17,12 +17,12 @@
  */
 package org.apache.struts2.interceptor;
 
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.ActionProxy;
-import com.opensymphony.xwork.config.entities.ResultConfig;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.interceptor.MethodFilterInterceptor;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java Sun Jul  9 17:57:05 2006
@@ -19,13 +19,13 @@
 
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.ActionProxy;
-import com.opensymphony.xwork.ValidationAware;
-import com.opensymphony.xwork.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java Sun Jul  9 17:57:05 2006
@@ -25,5 +25,5 @@
  * security reasons wants to make sure that parameters cannot be set by malicious users.
  *
  */
-public interface NoParameters extends com.opensymphony.xwork.interceptor.NoParameters {
+public interface NoParameters extends com.opensymphony.xwork2.interceptor.NoParameters {
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java Sun Jul  9 17:57:05 2006
@@ -17,12 +17,12 @@
  */
 package org.apache.struts2.interceptor;
 
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.ActionProxy;
-import com.opensymphony.xwork.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork.interceptor.PreResultListener;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.struts2.dispatcher.SessionMap;
 import org.apache.struts2.ServletActionContext;
 import org.apache.commons.logging.Log;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java Sun Jul  9 17:57:05 2006
@@ -21,9 +21,9 @@
 
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.util.ServletContextAware;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java Sun Jul  9 17:57:05 2006
@@ -17,9 +17,9 @@
  */
 package org.apache.struts2.interceptor;
 
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.ConversionErrorInterceptor;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.ConversionErrorInterceptor;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 
 /**
@@ -63,7 +63,7 @@
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @see com.opensymphony.xwork.ActionContext#getConversionErrors()
+ * @see com.opensymphony.xwork2.ActionContext#getConversionErrors()
  * @see ConversionErrorInterceptor
  */
 public class StrutsConversionErrorInterceptor extends ConversionErrorInterceptor {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java Sun Jul  9 17:57:05 2006
@@ -20,11 +20,11 @@
 import java.util.Map;
 
 import org.apache.struts2.util.TokenHelper;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.ValidationAware;
-import com.opensymphony.xwork.interceptor.MethodFilterInterceptor;
-import com.opensymphony.xwork.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ValidationAware;
+import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
 
 /**
  * <!-- START SNIPPET: description -->
@@ -117,7 +117,7 @@
 	public static final String INVALID_TOKEN_CODE = "invalid.token";
 
     /**
-     * @see com.opensymphony.xwork.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork.ActionInvocation)
+     * @see com.opensymphony.xwork2.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork2.ActionInvocation)
      */
     protected String doIntercept(ActionInvocation invocation) throws Exception {
         if (log.isDebugEnabled()) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java Sun Jul  9 17:57:05 2006
@@ -20,10 +20,10 @@
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.util.InvocationSessionStore;
 import org.apache.struts2.util.TokenHelper;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Result;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java Sun Jul  9 17:57:05 2006
@@ -17,11 +17,11 @@
  */
 package org.apache.struts2.interceptor.debugging;
 
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.interceptor.PreResultListener;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
@@ -65,7 +65,7 @@
     private final static Log log = LogFactory.getLog(DebuggingInterceptor.class);
 
     private String[] ignorePrefixes = new String[]{"org.apache.struts.",
-            "com.opensymphony.xwork.", "xwork."};
+            "com.opensymphony.xwork2.", "xwork."};
     private String[] _ignoreKeys = new String[]{"application", "session",
             "parameters", "request"};
     private HashSet<String> ignoreKeys = new HashSet<String>(Arrays.asList(_ignoreKeys));
@@ -97,7 +97,7 @@
     /*
      * (non-Javadoc)
      *
-     * @see com.opensymphony.xwork.interceptor.Interceptor#invoke(com.opensymphony.xwork.ActionInvocation)
+     * @see com.opensymphony.xwork2.interceptor.Interceptor#invoke(com.opensymphony.xwork2.ActionInvocation)
      */
     public String intercept(ActionInvocation inv) throws Exception {
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java Sun Jul  9 17:57:05 2006
@@ -19,13 +19,13 @@
 
 import javax.faces.context.FacesContext;
 
-import com.opensymphony.xwork.Action;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Result;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.config.entities.ResultConfig;
-import com.opensymphony.xwork.interceptor.Interceptor;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.interceptor.Interceptor;
 
 /**
  * Translates JSF phases into individual interceptors, and adapts their expected

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java Sun Jul  9 17:57:05 2006
@@ -25,8 +25,8 @@
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Result;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
 
 /**
  * Executes the JSF render phase

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java Sun Jul  9 17:57:05 2006
@@ -27,11 +27,11 @@
 
 import org.apache.struts2.ServletActionContext;
 
-import com.opensymphony.xwork.Action;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.config.entities.ResultConfig;
-import com.opensymphony.xwork.interceptor.Interceptor;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.interceptor.Interceptor;
 
 /**
  * Initializes the JSF context for this request

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java Sun Jul  9 17:57:05 2006
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 
 /**
  * Provides common lifecycle phase methods needed by interceptors and results.

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java Sun Jul  9 17:57:05 2006
@@ -20,7 +20,7 @@
 import javax.faces.application.NavigationHandler;
 import javax.faces.context.FacesContext;
 
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 
 /**
  * Overrides the JFS navigation by delegating the result to handling by the core

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 
 /**
  * Adds the current Action instance to the variable lookups. All other requests

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java Sun Jul  9 17:57:05 2006
@@ -17,16 +17,16 @@
  */
 package org.apache.struts2.plexus;
 
-import com.opensymphony.xwork.Action;
-import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.Result;
-import com.opensymphony.xwork.config.ConfigurationException;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.config.entities.InterceptorConfig;
-import com.opensymphony.xwork.config.entities.ResultConfig;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.util.OgnlUtil;
-import com.opensymphony.xwork.validator.Validator;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.util.OgnlUtil;
+import com.opensymphony.xwork2.validator.Validator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.util.ObjectFactoryInitializable;
@@ -153,7 +153,7 @@
         }
         catch (ClassCastException e) {
             cause = e;
-            message = "Class [" + interceptorClassName + "] does not implement com.opensymphony.xwork.interceptor.Interceptor";
+            message = "Class [" + interceptorClassName + "] does not implement com.opensymphony.xwork2.interceptor.Interceptor";
         }
         catch (Exception e) {
             cause = e;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java Sun Jul  9 17:57:05 2006
@@ -28,7 +28,7 @@
 import javax.portlet.RenderResponse;
 
 import org.apache.struts2.portlet.PortletActionConstants;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 
 
 /**

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java Sun Jul  9 17:57:05 2006
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.struts2.StrutsStatics;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 
 /**
  * Since a portlet is not dispatched the same way as a servlet, the 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.portlet.dispatcher;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * When a portlet is targetted for an <code>event</code>, the portlet will receive two 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Sun Jul  9 17:57:05 2006
@@ -55,14 +55,14 @@
 
 import com.opensymphony.util.ClassLoaderUtil;
 import com.opensymphony.util.FileManager;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionProxy;
-import com.opensymphony.xwork.ActionProxyFactory;
-import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.config.ConfigurationException;
-import com.opensymphony.xwork.config.ConfigurationManager;
-import com.opensymphony.xwork.util.LocalizedTextUtil;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 /**
  * <!-- START SNIPPET: javadoc -->

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Sun Jul  9 17:57:05 2006
@@ -39,7 +39,7 @@
 import org.apache.struts2.dispatcher.StrutsResultSupport;
 import org.apache.struts2.portlet.PortletActionConstants;
 import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork2.ActionInvocation;
 
 /**
  * Result type that includes a JSP to render.
@@ -63,7 +63,7 @@
      * {@link javax.portlet.PortletRequestDispatcher}from the
      * {@link PortletActionContext}and includes the JSP.
      * 
-     * @see com.opensymphony.xwork.Result#execute(com.opensymphony.xwork.ActionInvocation)
+     * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
      */
     public void doExecute(String finalLocation,
             ActionInvocation actionInvocation) throws Exception {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java Sun Jul  9 17:57:05 2006
@@ -25,9 +25,9 @@
 import org.apache.struts2.portlet.context.PortletActionContext;
 import org.apache.struts2.views.JspSupportServlet;
 import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/XWorkConfigRetriever.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/XWorkConfigRetriever.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/XWorkConfigRetriever.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/XWorkConfigRetriever.java Sun Jul  9 17:57:05 2006
@@ -3,9 +3,9 @@
  */
 package org.apache.struts2.sitegraph;
 
-import com.opensymphony.xwork.config.ConfigurationProvider;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.dispatcher.DispatcherUtils;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java Sun Jul  9 17:57:05 2006
@@ -4,7 +4,7 @@
 package org.apache.struts2.sitegraph.collectors;
 
 import com.opensymphony.util.FileManager;
-import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -33,7 +33,7 @@
     /**
      * Override Xwork method so we cn use an arbitrary config file
      *
-     * @see com.opensymphony.xwork.config.providers.XmlConfigurationProvider#getInputStream(java.lang.String)
+     * @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#getInputStream(java.lang.String)
      */
     protected InputStream getInputStream(String fileName) {
         InputStream is = null;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java Sun Jul  9 17:57:05 2006
@@ -23,9 +23,9 @@
 import org.apache.struts2.sitegraph.entities.View;
 import org.apache.struts2.sitegraph.model.*;
 import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork.ActionChainResult;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.config.entities.ResultConfig;
+import com.opensymphony.xwork2.ActionChainResult;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
 
 import java.io.IOException;
 import java.io.Writer;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.HTMLPage;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
-import com.opensymphony.xwork.*;
+import com.opensymphony.xwork2.*;
 import freemarker.template.Configuration;
 import freemarker.template.SimpleHash;
 import freemarker.template.Template;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java Sun Jul  9 17:57:05 2006
@@ -25,9 +25,9 @@
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.config.Configuration;
 
-import com.opensymphony.xwork.*;
-import com.opensymphony.xwork.interceptor.PreResultListener;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.HTMLPage;
 import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.Template;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java Sun Jul  9 17:57:05 2006
@@ -20,7 +20,7 @@
 import org.apache.struts2.config.Configuration;
 import org.apache.struts2.util.ObjectFactoryInitializable;
 import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork.spring.SpringObjectFactory;
+import com.opensymphony.xwork2.spring.SpringObjectFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java Sun Jul  9 17:57:05 2006
@@ -17,9 +17,9 @@
  */
 package org.apache.struts2.spring.lifecycle;
 
-import com.opensymphony.xwork.config.Configuration;
-import com.opensymphony.xwork.config.ExternalReferenceResolver;
-import com.opensymphony.xwork.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ExternalReferenceResolver;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
 
 import org.apache.struts2.dispatcher.DispatcherListener;
 import org.apache.struts2.dispatcher.DispatcherUtils;
@@ -37,7 +37,7 @@
 import java.util.Map;
 
 /**
- * Setup any {@link com.opensymphony.xwork.config.ExternalReferenceResolver}s
+ * Setup any {@link com.opensymphony.xwork2.config.ExternalReferenceResolver}s
  * that implement the ApplicationContextAware interface from the Spring
  * framework. Relies on Spring's
  * {@link org.springframework.web.context.ContextLoaderListener}having been

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java Sun Jul  9 17:57:05 2006
@@ -17,9 +17,9 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import java.io.Serializable;
 import java.util.HashMap;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
  * An interface indicating the lifecycle of an ObjectFactory implementation.
  * 
  * @see ObjectFactoryLifecycle
- * @see com.opensymphony.xwork.ObjectFactory
+ * @see com.opensymphony.xwork2.ObjectFactory
  * @see org.apache.struts2.util.ObjectFactoryInitializable
  * @see org.apache.struts2.util.ObjectFactoryDestroyable
  */

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java Sun Jul  9 17:57:05 2006
@@ -17,8 +17,8 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.config.Configuration;
-import com.opensymphony.xwork.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.commons.logging.LogFactory;
 
 import java.util.*;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import java.util.Comparator;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java Sun Jul  9 17:57:05 2006
@@ -20,8 +20,8 @@
 import com.opensymphony.util.TextUtils;
 import org.apache.struts2.views.jsp.ui.OgnlTool;
 import org.apache.struts2.views.util.UrlHelper;
-import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.util;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java Sun Jul  9 17:57:05 2006
@@ -18,8 +18,8 @@
 package org.apache.struts2.util;
 
 import com.opensymphony.util.GUID;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.util;
 
 import org.apache.struts2.views.velocity.VelocityManager;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java Sun Jul  9 17:57:05 2006
@@ -21,10 +21,10 @@
 import org.apache.struts2.dispatcher.DispatcherUtils;
 import org.apache.struts2.dispatcher.RequestMap;
 import org.apache.struts2.dispatcher.SessionMap;
-import com.opensymphony.xwork.*;
-import com.opensymphony.xwork.config.Configuration;
-import com.opensymphony.xwork.config.ConfigurationManager;
-import com.opensymphony.xwork.config.entities.ActionConfig;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import uk.ltd.getahead.dwr.ExecutionContext;
@@ -45,7 +45,7 @@
  * &lt;dwr&lt;
  *    &lt;allow&lt;
  *      &lt;create creator="new" javascript="validator" class="org.apache.struts2.validators.DWRValidator"/&lt;
- *      &lt;convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/&lt;
+ *      &lt;convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/&lt;
  *    &lt;/allow&lt;
  * &lt;/dwr&lt;
  * 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java Sun Jul  9 17:57:05 2006
@@ -23,8 +23,8 @@
 import org.apache.struts2.views.freemarker.tags.StrutsModels;
 import org.apache.struts2.views.util.ContextUtil;
 import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.cache.MultiTemplateLoader;
 import freemarker.cache.TemplateLoader;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java Sun Jul  9 17:57:05 2006
@@ -20,10 +20,10 @@
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.StrutsResultSupport;
 import org.apache.struts2.views.util.ResourceUtil;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.LocaleProvider;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import freemarker.template.*;
 
 import javax.servlet.ServletContext;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java Sun Jul  9 17:57:05 2006
@@ -33,9 +33,9 @@
 import org.apache.struts2.portlet.PortletActionConstants;
 import org.apache.struts2.portlet.context.PortletActionContext;
 import org.apache.struts2.views.util.ResourceUtil;
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.views.freemarker;
 
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.SimpleHash;
 import freemarker.template.TemplateModel;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.views.freemarker.tags;
 
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 import org.apache.struts2.components.Component;
 import org.apache.struts2.components.ActionError;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.components.Component;
 import org.apache.struts2.components.ActionMessage;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.components.ActionComponent;
 import org.apache.struts2.components.Component;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.components.Component;
 import org.apache.struts2.components.Anchor;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.components.Bean;
 import org.apache.struts2.components.Component;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java Sun Jul  9 17:57:05 2006
@@ -19,7 +19,7 @@
 
 import org.apache.struts2.components.CheckboxList;
 import org.apache.struts2.components.Component;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;



Mime
View raw message