You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/02 17:33:45 UTC
svn commit: r1209569 [7/50] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mail...
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Param;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Param
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Password;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Password
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Property;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Push;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Push
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Radio;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Radio
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see org.apache.struts2.components.Reset
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Select;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Select
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Set;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Set
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Submit;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Submit
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextArea;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TextArea
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Text;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Text
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.TextField;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TextField
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Token;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Token
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.URL;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see URL
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Component;
import org.apache.struts2.components.UpDownSelect;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see UpDownSelect
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java Fri Dec 2 16:33:03 2011
@@ -21,11 +21,9 @@
package org.apache.struts2.views.xslt;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.struts2.StrutsException;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -33,8 +31,9 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.UserDataHandler;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
/**
* AbstractAdapterNode is the base for childAdapters that expose a read-only view
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java Fri Dec 2 16:33:03 2011
@@ -24,11 +24,10 @@ package org.apache.struts2.views.xslt;
import java.util.ArrayList;
import java.util.List;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.Node;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java Fri Dec 2 16:33:03 2011
@@ -32,12 +32,11 @@ import java.util.List;
import java.util.Map;
import org.apache.struts2.StrutsException;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* This class is the most general type of adapter, utilizing reflective introspection to present a DOM view of all of
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java Fri Dec 2 16:33:03 2011
@@ -25,11 +25,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.Node;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java Fri Dec 2 16:33:03 2011
@@ -24,6 +24,8 @@ package org.apache.struts2.views.xslt;
import java.util.ArrayList;
import java.util.List;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -31,9 +33,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.TypeInfo;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* ProxyElementAdapter is a pass-through adapter for objects which already
* implement the Element interface. All methods are proxied to the underlying
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java Fri Dec 2 16:33:03 2011
@@ -21,13 +21,12 @@
package org.apache.struts2.views.xslt;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* ProxyNodeAdapter is a read-only delegating adapter for objects which already
* implement the Node interface. All methods are proxied to the underlying
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java Fri Dec 2 16:33:03 2011
@@ -29,8 +29,8 @@ import javax.xml.transform.TransformerEx
import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java Fri Dec 2 16:33:03 2011
@@ -23,12 +23,11 @@ package org.apache.struts2.views.xslt;
import java.util.List;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
public class SimpleNodeList implements NodeList {
private Logger log = LoggerFactory.getLogger(SimpleNodeList.class);
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java Fri Dec 2 16:33:03 2011
@@ -25,13 +25,12 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
+import org.apache.struts2.xwork2.util.DomHelper;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import com.opensymphony.xwork2.util.DomHelper;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* StringAdapter adapts a Java String value to a DOM Element with the specified
* property name containing the String's text.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,6 @@ package org.apache.struts2.views.xslt;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.Writer;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -45,14 +44,14 @@ import org.apache.struts2.ServletActionC
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Result;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/resources/org/apache/struts2/default.properties
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/resources/org/apache/struts2/default.properties?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/resources/org/apache/struts2/default.properties (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/resources/org/apache/struts2/default.properties Fri Dec 2 16:33:03 2011
@@ -35,7 +35,7 @@ struts.i18n.encoding=UTF-8
### if specified, the default object factory can be overridden here
### Note: short-hand notation is supported in some cases, such as "spring"
-### Alternatively, you can provide a com.opensymphony.xwork2.ObjectFactory subclass name here
+### Alternatively, you can provide a org.apache.struts2.xwork2.ObjectFactory subclass name here
# struts.objectFactory = spring
### specifies the autoWiring logic when using the SpringObjectFactory.
@@ -54,9 +54,9 @@ struts.objectFactory.spring.autoWire.alw
### if specified, the default object type determiner can be overridden here
### Note: short-hand notation is supported in some cases, such as "tiger" or "notiger"
-### Alternatively, you can provide a com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
-### Note: By default, com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer is used which handles type detection
-### using generics. com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer was deprecated since XWork 2, it's
+### Alternatively, you can provide a org.apache.struts2.xwork2.util.ObjectTypeDeterminer implementation name here
+### Note: By default, org.apache.struts2.xwork2.util.DefaultObjectTypeDeterminer is used which handles type detection
+### using generics. org.apache.struts2.xwork2.util.GenericsObjectTypeDeterminer was deprecated since XWork 2, it's
### functions are integrated in DefaultObjectTypeDeterminer now.
### To disable tiger support use the "notiger" property value here.
#struts.objectTypeDeterminer = tiger
Modified: struts/struts2/branches/STRUTS_3_X/core/src/main/resources/struts-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/main/resources/struts-default.xml?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/main/resources/struts-default.xml Fri Dec 2 16:33:03 2011
@@ -26,19 +26,19 @@
"http://struts.apache.org/dtds/struts-2.3.dtd">
<struts>
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="xwork" />
- <bean type="com.opensymphony.xwork2.ObjectFactory" name="struts" class="org.apache.struts2.impl.StrutsObjectFactory" />
+ <bean class="org.apache.struts2.xwork2.ObjectFactory" name="xwork" />
+ <bean type="org.apache.struts2.xwork2.ObjectFactory" name="struts" class="org.apache.struts2.impl.StrutsObjectFactory" />
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="xwork" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts" class="org.apache.struts2.impl.StrutsActionProxyFactory"/>
+ <bean type="org.apache.struts2.xwork2.ActionProxyFactory" name="xwork" class="org.apache.struts2.xwork2.DefaultActionProxyFactory"/>
+ <bean type="org.apache.struts2.xwork2.ActionProxyFactory" name="struts" class="org.apache.struts2.impl.StrutsActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer" name="tiger" class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer" name="notiger" class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
-
- <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="struts" class="com.opensymphony.xwork2.util.WildcardHelper" />
- <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="namedVariable" class="com.opensymphony.xwork2.util.NamedVariablePatternMatcher"/>
- <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="regex" class="org.apache.struts2.util.RegexPatternMatcher"/>
+ <bean type="org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer" name="tiger" class="org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
+ <bean type="org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer" name="notiger" class="org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
+ <bean type="org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer" name="struts" class="org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
+
+ <bean type="org.apache.struts2.xwork2.util.PatternMatcher" name="struts" class="org.apache.struts2.xwork2.util.WildcardHelper" />
+ <bean type="org.apache.struts2.xwork2.util.PatternMatcher" name="namedVariable" class="org.apache.struts2.xwork2.util.NamedVariablePatternMatcher"/>
+ <bean type="org.apache.struts2.xwork2.util.PatternMatcher" name="regex" class="org.apache.struts2.util.RegexPatternMatcher"/>
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="struts" class="org.apache.struts2.dispatcher.mapper.DefaultActionMapper" />
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="composite" class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
@@ -59,56 +59,56 @@
<bean type="org.apache.struts2.components.template.TemplateEngine" name="vm" class="org.apache.struts2.components.template.VelocityTemplateEngine" />
<bean type="org.apache.struts2.components.template.TemplateEngine" name="jsp" class="org.apache.struts2.components.template.JspTemplateEngine" />
- <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
- <bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter" name="xwork1" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter" />
+ <bean type="org.apache.struts2.xwork2.conversion.impl.XWorkConverter" name="struts" class="org.apache.struts2.xwork2.conversion.impl.XWorkConverter" />
+ <bean type="org.apache.struts2.xwork2.conversion.impl.XWorkConverter" name="xwork1" class="org.apache.struts2.xwork2.conversion.impl.XWorkConverter" />
+ <bean class="org.apache.struts2.xwork2.conversion.impl.XWorkBasicConverter" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="xwork1" class="com.opensymphony.xwork2.TextProviderSupport" scope="default" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="struts" class="com.opensymphony.xwork2.TextProviderSupport" scope="default" />
+ <bean type="org.apache.struts2.xwork2.TextProvider" name="xwork1" class="org.apache.struts2.xwork2.TextProviderSupport" scope="default" />
+ <bean type="org.apache.struts2.xwork2.TextProvider" name="struts" class="org.apache.struts2.xwork2.TextProviderSupport" scope="default" />
<bean type="org.apache.struts2.components.UrlRenderer" name="struts" class="org.apache.struts2.components.ServletUrlRenderer"/>
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="struts" class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider" name="struts" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory" name="struts" class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
-
- <bean type="com.opensymphony.xwork2.TextProvider" name="system" class="com.opensymphony.xwork2.DefaultTextProvider" />
- <bean type="com.opensymphony.xwork2.conversion.NullHandler" name="java.lang.Object" class="com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler" />
-
- <bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="struts" class="com.opensymphony.xwork2.validator.AnnotationActionValidatorManager" />
- <bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="no-annotations" class="com.opensymphony.xwork2.validator.DefaultActionValidatorManager" />
-
- <bean type="com.opensymphony.xwork2.validator.ValidatorFactory" class="com.opensymphony.xwork2.validator.DefaultValidatorFactory"/>
- <bean type="com.opensymphony.xwork2.validator.ValidatorFileParser" class="com.opensymphony.xwork2.validator.DefaultValidatorFileParser" />
-
- <bean class="com.opensymphony.xwork2.ognl.OgnlUtil" />
-
- <bean type="ognl.PropertyAccessor" name="com.opensymphony.xwork2.util.CompoundRoot" class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.lang.Object" class="com.opensymphony.xwork2.ognl.accessor.ObjectAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Iterator" class="com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Enumeration" class="com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.List" class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Set" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Map" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.Collection" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="com.opensymphony.xwork2.ognl.ObjectProxy" class="com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
+ <bean type="org.apache.struts2.xwork2.util.ValueStackFactory" name="struts" class="org.apache.struts2.xwork2.ognl.OgnlValueStackFactory" />
+ <bean type="org.apache.struts2.xwork2.util.reflection.ReflectionProvider" name="struts" class="org.apache.struts2.xwork2.ognl.OgnlReflectionProvider" />
+ <bean type="org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory" name="struts" class="org.apache.struts2.xwork2.ognl.OgnlReflectionContextFactory" />
+
+ <bean type="org.apache.struts2.xwork2.TextProvider" name="system" class="org.apache.struts2.xwork2.DefaultTextProvider" />
+ <bean type="org.apache.struts2.xwork2.conversion.NullHandler" name="java.lang.Object" class="org.apache.struts2.xwork2.conversion.impl.InstantiatingNullHandler" />
+
+ <bean type="org.apache.struts2.xwork2.validator.ActionValidatorManager" name="struts" class="org.apache.struts2.xwork2.validator.AnnotationActionValidatorManager" />
+ <bean type="org.apache.struts2.xwork2.validator.ActionValidatorManager" name="no-annotations" class="org.apache.struts2.xwork2.validator.DefaultActionValidatorManager" />
+
+ <bean type="org.apache.struts2.xwork2.validator.ValidatorFactory" class="org.apache.struts2.xwork2.validator.DefaultValidatorFactory"/>
+ <bean type="org.apache.struts2.xwork2.validator.ValidatorFileParser" class="org.apache.struts2.xwork2.validator.DefaultValidatorFileParser" />
+
+ <bean class="org.apache.struts2.xwork2.ognl.OgnlUtil" />
+
+ <bean type="ognl.PropertyAccessor" name="org.apache.struts2.xwork2.util.CompoundRoot" class="org.apache.struts2.xwork2.ognl.accessor.CompoundRootAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.lang.Object" class="org.apache.struts2.xwork2.ognl.accessor.ObjectAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.Iterator" class="org.apache.struts2.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.Enumeration" class="org.apache.struts2.xwork2.ognl.accessor.XWorkEnumerationAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.List" class="org.apache.struts2.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.Set" class="org.apache.struts2.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.Map" class="org.apache.struts2.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.Collection" class="org.apache.struts2.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="org.apache.struts2.xwork2.ognl.ObjectProxy" class="org.apache.struts2.xwork2.ognl.accessor.ObjectProxyPropertyAccessor" />
- <bean type="ognl.MethodAccessor" name="java.lang.Object" class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor" />
- <bean type="ognl.MethodAccessor" name="com.opensymphony.xwork2.util.CompoundRoot" class="com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor" />
+ <bean type="ognl.MethodAccessor" name="java.lang.Object" class="org.apache.struts2.xwork2.ognl.accessor.XWorkMethodAccessor" />
+ <bean type="ognl.MethodAccessor" name="org.apache.struts2.xwork2.util.CompoundRoot" class="org.apache.struts2.xwork2.ognl.accessor.CompoundRootAccessor" />
<bean class="org.apache.struts2.views.jsp.ui.OgnlTool" />
<bean type="org.apache.struts2.dispatcher.StaticContentLoader" class="org.apache.struts2.dispatcher.DefaultStaticContentLoader" name="struts" />
- <bean type="com.opensymphony.xwork2.UnknownHandlerManager" class="com.opensymphony.xwork2.DefaultUnknownHandlerManager" name="struts" />
+ <bean type="org.apache.struts2.xwork2.UnknownHandlerManager" class="org.apache.struts2.xwork2.DefaultUnknownHandlerManager" name="struts" />
<!-- Silly workarounds for OGNL since there is currently no way to flush its internal caches -->
- <bean type="ognl.PropertyAccessor" name="java.util.ArrayList" class="com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
- <bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.ArrayList" class="org.apache.struts2.xwork2.ognl.accessor.XWorkListPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="org.apache.struts2.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
+ <bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="org.apache.struts2.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
<package name="struts-default" abstract="true">
<result-types>
- <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult"/>
+ <result-type name="chain" class="org.apache.struts2.xwork2.ActionChainResult"/>
<result-type name="dispatcher" class="org.apache.struts2.dispatcher.ServletDispatcherResult" default="true"/>
<result-type name="freemarker" class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
<result-type name="httpheader" class="org.apache.struts2.dispatcher.HttpHeaderResult"/>
@@ -121,37 +121,37 @@
</result-types>
<interceptors>
- <interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/>
- <interceptor name="autowiring" class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor"/>
- <interceptor name="chain" class="com.opensymphony.xwork2.interceptor.ChainingInterceptor"/>
+ <interceptor name="alias" class="org.apache.struts2.xwork2.interceptor.AliasInterceptor"/>
+ <interceptor name="autowiring" class="org.apache.struts2.xwork2.spring.interceptor.ActionAutowiringInterceptor"/>
+ <interceptor name="chain" class="org.apache.struts2.xwork2.interceptor.ChainingInterceptor"/>
<interceptor name="conversionError" class="org.apache.struts2.interceptor.StrutsConversionErrorInterceptor"/>
<interceptor name="cookie" class="org.apache.struts2.interceptor.CookieInterceptor"/>
<interceptor name="clearSession" class="org.apache.struts2.interceptor.ClearSessionInterceptor" />
<interceptor name="createSession" class="org.apache.struts2.interceptor.CreateSessionInterceptor" />
<interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor" />
<interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
- <interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
+ <interceptor name="exception" class="org.apache.struts2.xwork2.interceptor.ExceptionMappingInterceptor"/>
<interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
- <interceptor name="i18n" class="com.opensymphony.xwork2.interceptor.I18nInterceptor"/>
- <interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
- <interceptor name="modelDriven" class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
- <interceptor name="scopedModelDriven" class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
- <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
+ <interceptor name="i18n" class="org.apache.struts2.xwork2.interceptor.I18nInterceptor"/>
+ <interceptor name="logger" class="org.apache.struts2.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="modelDriven" class="org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="scopedModelDriven" class="org.apache.struts2.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
+ <interceptor name="params" class="org.apache.struts2.xwork2.interceptor.ParametersInterceptor"/>
<interceptor name="actionMappingParams" class="org.apache.struts2.interceptor.ActionMappingParametersInteceptor"/>
- <interceptor name="prepare" class="com.opensymphony.xwork2.interceptor.PrepareInterceptor"/>
- <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="prepare" class="org.apache.struts2.xwork2.interceptor.PrepareInterceptor"/>
+ <interceptor name="staticParams" class="org.apache.struts2.xwork2.interceptor.StaticParametersInterceptor"/>
<interceptor name="scope" class="org.apache.struts2.interceptor.ScopeInterceptor"/>
<interceptor name="servletConfig" class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
- <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="timer" class="org.apache.struts2.xwork2.interceptor.TimerInterceptor"/>
<interceptor name="token" class="org.apache.struts2.interceptor.TokenInterceptor"/>
<interceptor name="tokenSession" class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="validation" class="org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor"/>
- <interceptor name="workflow" class="com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor"/>
+ <interceptor name="workflow" class="org.apache.struts2.xwork2.interceptor.DefaultWorkflowInterceptor"/>
<interceptor name="store" class="org.apache.struts2.interceptor.MessageStoreInterceptor" />
<interceptor name="checkbox" class="org.apache.struts2.interceptor.CheckboxInterceptor" />
<interceptor name="profiling" class="org.apache.struts2.interceptor.ProfilingActivationInterceptor" />
<interceptor name="roles" class="org.apache.struts2.interceptor.RolesInterceptor" />
- <interceptor name="annotationWorkflow" class="com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor" />
+ <interceptor name="annotationWorkflow" class="org.apache.struts2.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor" />
<interceptor name="multiselect" class="org.apache.struts2.interceptor.MultiselectInterceptor" />
<!-- Basic stack -->
@@ -300,7 +300,7 @@
<default-interceptor-ref name="defaultStack"/>
- <default-class-ref class="com.opensymphony.xwork2.ActionSupport" />
+ <default-class-ref class="org.apache.struts2.xwork2.ActionSupport" />
</package>
</struts>
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java Fri Dec 2 16:33:03 2011
@@ -21,9 +21,9 @@
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ServletActionContextTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ServletActionContextTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/ServletActionContextTest.java Fri Dec 2 16:33:03 2011
@@ -32,7 +32,7 @@ import junit.framework.TestCase;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockServletContext;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/StrutsTestCase.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/StrutsTestCase.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/StrutsTestCase.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/StrutsTestCase.java Fri Dec 2 16:33:03 2011
@@ -29,16 +29,14 @@ import java.util.logging.Formatter;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.util.StrutsTestCaseHelper;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.jdk.JdkLoggerFactory;
import org.springframework.mock.web.MockServletContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
-
/**
* Base test case for JUnit testing Struts.
*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestAction.java Fri Dec 2 16:33:03 2011
@@ -25,9 +25,9 @@ import java.util.*;
import org.apache.struts2.views.jsp.ui.User;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestActionTagResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestActionTagResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestActionTagResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestActionTagResult.java Fri Dec 2 16:33:03 2011
@@ -21,8 +21,8 @@
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Result;
public class TestActionTagResult implements Result {
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java Fri Dec 2 16:33:03 2011
@@ -21,32 +21,27 @@
package org.apache.struts2;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
import org.apache.struts2.dispatcher.ServletDispatcherResult;
import org.apache.struts2.interceptor.TokenInterceptor;
import org.apache.struts2.interceptor.TokenSessionStoreInterceptor;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.DefaultActionProxyFactory;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import com.opensymphony.xwork2.mock.MockResult;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.DefaultActionProxyFactory;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.interceptor.ParametersInterceptor;
+import org.apache.struts2.xwork2.mock.MockResult;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/TestResult.java Fri Dec 2 16:33:03 2011
@@ -26,12 +26,12 @@ import java.util.List;
import junit.framework.Assert;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Result;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java Fri Dec 2 16:33:03 2011
@@ -25,11 +25,11 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.util.ValueStack;
public class ActionComponentTest extends StrutsTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ComponentTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ComponentTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/ComponentTest.java Fri Dec 2 16:33:03 2011
@@ -44,8 +44,8 @@ import org.apache.struts2.views.jsp.iter
import org.apache.struts2.views.jsp.ui.TextFieldTag;
import org.apache.struts2.views.jsp.ui.UpDownSelectTag;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
/**
* Test case for method findAncestor(Class) in Component and some commons
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormButtonTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormButtonTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormButtonTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormButtonTest.java Fri Dec 2 16:33:03 2011
@@ -22,13 +22,11 @@
package org.apache.struts2.components;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-
/**
*
* @version $Date$ $Id$
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/FormTest.java Fri Dec 2 16:33:03 2011
@@ -25,15 +25,14 @@ import java.util.List;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator;
import org.easymock.EasyMock;
-import com.opensymphony.xwork2.validator.validators.RequiredFieldValidator;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-
/**
* <code>FormTest</code>
*
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/PropertyTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/PropertyTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/PropertyTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/PropertyTest.java Fri Dec 2 16:33:03 2011
@@ -24,18 +24,12 @@ package org.apache.struts2.components;
import java.io.StringWriter;
import java.util.Map;
-import junit.framework.TestCase;
-import ognl.Ognl;
-
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.util.StrutsTypeConverter;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIBeanTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIBeanTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIBeanTest.java Fri Dec 2 16:33:03 2011
@@ -25,12 +25,11 @@ import java.util.Collections;
import java.util.Map;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.ValueStack;
-
/**
*
* @version $Date$ $Id$
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIComponentTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIComponentTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/components/UIComponentTest.java Fri Dec 2 16:33:03 2011
@@ -44,7 +44,7 @@ import org.apache.struts2.views.jsp.ui.T
import org.apache.struts2.views.jsp.ui.TextareaTag;
import org.apache.struts2.views.jsp.ui.TokenTag;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java Fri Dec 2 16:33:03 2011
@@ -25,9 +25,9 @@ import java.util.Locale;
import org.apache.struts2.StrutsConstants;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/LegacyPropertiesConfigurationProviderTest.java Fri Dec 2 16:33:03 2011
@@ -21,16 +21,11 @@
package org.apache.struts2.config;
-import java.util.Iterator;
import java.util.Locale;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.StrutsTestCase;
-
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Container;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
import junit.framework.TestCase;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/SettingsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/SettingsTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/SettingsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/config/SettingsTest.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import java.util.Locale;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java Fri Dec 2 16:33:03 2011
@@ -25,36 +25,27 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.FilterDispatcherTest.InnerActionMapper;
import org.apache.struts2.dispatcher.FilterDispatcherTest.InnerDestroyableObjectFactory;
-import org.apache.struts2.dispatcher.FilterDispatcherTest.InnerDispatcher;
-import org.springframework.mock.web.MockFilterConfig;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.ConfigurationManager;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.config.entities.InterceptorStackConfig;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.mockobjects.servlet.MockFilterChain;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.InterceptorStackConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Context;
-import com.opensymphony.xwork2.inject.Factory;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
/**
* Test case for Dispatcher.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java Fri Dec 2 16:33:03 2011
@@ -23,7 +23,6 @@ package org.apache.struts2.dispatcher;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Map;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
@@ -31,24 +30,19 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.util.ObjectFactoryDestroyable;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.ConfigurationManager;
+import org.apache.struts2.xwork2.config.impl.DefaultConfiguration;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import com.mockobjects.servlet.MockFilterChain;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Context;
-import com.opensymphony.xwork2.inject.Factory;
/**
* FilterDispatcher TestCase.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java Fri Dec 2 16:33:03 2011
@@ -32,20 +32,18 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import junit.framework.TestCase;
-
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.ConfigurationManager;
+import org.apache.struts2.xwork2.inject.Container;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import com.mockobjects.servlet.MockFilterChain;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.inject.Container;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java Fri Dec 2 16:33:03 2011
@@ -31,10 +31,9 @@ import org.apache.struts2.StrutsTestCase
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ognl.OgnlUtil;
-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java Fri Dec 2 16:33:03 2011
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import com.opensymphony.xwork2.config.ConfigurationManager;
+import org.apache.struts2.xwork2.config.ConfigurationManager;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java Fri Dec 2 16:33:03 2011
@@ -25,19 +25,16 @@ import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import junit.framework.TestCase;
-
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* Test case for PlainTextResult.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java Fri Dec 2 16:33:03 2011
@@ -21,13 +21,13 @@
package org.apache.struts2.dispatcher;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java Fri Dec 2 16:33:03 2011
@@ -25,8 +25,8 @@ import junit.framework.Assert;
import org.apache.struts2.TestAction;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java Fri Dec 2 16:33:03 2011
@@ -33,7 +33,7 @@ import org.apache.struts2.StrutsTestCase
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java Fri Dec 2 16:33:03 2011
@@ -23,19 +23,20 @@ package org.apache.struts2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
import ognl.Ognl;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import static org.easymock.EasyMock.*;
+
import org.easymock.IMocksControl;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java Fri Dec 2 16:33:03 2011
@@ -27,19 +27,15 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-
/**
* Unit test for {@link StreamResult}.
*
@@ -229,7 +225,7 @@ public class StreamResultTest extends St
MyImageAction action = new MyImageAction();
contentLength = (int) action.getContentLength();
- mai = new com.opensymphony.xwork2.mock.MockActionInvocation();
+ mai = new MockActionInvocation();
mai.setAction(action);
mai.setStack(stack);
mai.setInvocationContext(ActionContext.getContext());
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java Fri Dec 2 16:33:03 2011
@@ -22,14 +22,12 @@
package org.apache.struts2.dispatcher;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.easymock.EasyMock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-
/**
* Test case for StrutsResultSupport.
*/
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java Fri Dec 2 16:33:03 2011
@@ -21,20 +21,17 @@
package org.apache.struts2.dispatcher;
-import junit.framework.TestCase;
-
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
/**