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 [10/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/mai...
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.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.dojo.components.Bind;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
public class BindTag extends AbstractValidateTag {
protected String targets;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.dojo.components.DateTimePicker;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see DateTimePicker
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.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.dojo.components.Div;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
public class DivTag extends AbstractRemoteTag {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.dojo.components.Head;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Head
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.dojo.components.Submit;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Submit
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.dojo.components.TabbedPanel;
import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TabbedPanel
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.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.dojo.components.TextArea;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.dojo.components.TreeNode;
import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TreeNode
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,7 @@ import org.apache.struts2.components.Com
import org.apache.struts2.dojo.components.Tree;
import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Tree
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java Fri Dec 2 16:33:03 2011
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.components.Anchor;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Anchor
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.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.dojo.components.Autocompleter;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Autocompleter
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.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.dojo.components.Bind;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Bind
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.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.dojo.components.DateTimePicker;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see DateTimePicker
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.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.dojo.components.Div;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Div
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.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.dojo.components.Head;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see Head
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/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/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.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.dojo.components.TabbedPanel;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TabbedPanel
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/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.dojo.components.TextArea;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* @see TextArea
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.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.dojo.components.Tree;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <code>TreeDirective</code>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.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.dojo.components.TreeNode;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
* <code>TreeNodeDirective</code>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java Fri Dec 2 16:33:03 2011
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Map;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
/**
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java Fri Dec 2 16:33:03 2011
@@ -39,10 +39,10 @@ import org.apache.struts2.dojo.TestActio
import org.apache.struts2.dojo.components.Head;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.ValueStack;
/**
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java Fri Dec 2 16:33:03 2011
@@ -38,9 +38,9 @@ import java.util.StringTokenizer;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork2.ActionContext;
-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.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java Fri Dec 2 16:33:03 2011
@@ -22,8 +22,8 @@
package org.apache.struts2.dojo.views.jsp.ui;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
/**
* Test case for Tree component.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java Fri Dec 2 16:33:03 2011
@@ -32,25 +32,18 @@ import org.apache.struts2.dispatcher.App
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.RequestMap;
import org.apache.struts2.dispatcher.SessionMap;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.DefaultActionInvocation;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.ValidationAwareSupport;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import uk.ltd.getahead.dwr.WebContextFactory;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.DefaultActionInvocation;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.ValidationAwareSupport;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
/**
* <p/>
* Use the dwr configuration as follows :-
@@ -61,7 +54,7 @@ import com.opensymphony.xwork2.util.logg
* <dwr>
* <allow>
* <create creator="new" javascript="validator" class="org.apache.struts2.validators.DWRValidator"/>
- * <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
+ * <convert converter="bean" match="org.apache.struts2.xwork2.ValidationAwareSupport"/>
* </allow>
* </dwr>
*
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ActionInvocation;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.dispatcher.StrutsResultSupport;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java Fri Dec 2 16:33:03 2011
@@ -20,12 +20,12 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.util.URLUtil;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
-import com.opensymphony.xwork2.util.finder.UrlSet;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.URLUtil;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterfaceDelegate;
+import org.apache.struts2.xwork2.util.finder.UrlSet;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
import org.apache.struts2.views.util.UrlHelper;
import javax.servlet.Servlet;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java Fri Dec 2 16:33:03 2011
@@ -28,7 +28,6 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.*;
@@ -43,7 +42,7 @@ import org.apache.struts2.jasper.servlet
import org.apache.struts2.jasper.xmlparser.ParserUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
/**
* Shell for the jspc compiler. Handles all options associated with the
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java Fri Dec 2 16:33:03 2011
@@ -17,7 +17,7 @@
package org.apache.struts2.jasper;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.jasper.compiler.Compiler;
import org.apache.struts2.jasper.compiler.JspRuntimeContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java Fri Dec 2 16:33:03 2011
@@ -18,8 +18,8 @@
package org.apache.struts2.jasper.servlet;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
import java.io.File;
import java.io.InputStream;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java Fri Dec 2 16:33:03 2011
@@ -20,12 +20,12 @@
*/
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
+import org.apache.struts2.xwork2.util.finder.ClassLoaderInterfaceDelegate;
import junit.framework.TestCase;
import org.apache.commons.lang.StringUtils;
import org.easymock.EasyMock;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxp.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxp.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxp.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxp.java Fri Dec 2 16:33:03 2011
@@ -23,10 +23,6 @@ package org.apache.struts2.views.gxp;
import com.google.common.annotations.VisibleForTesting;
import com.google.gxp.base.GxpContext;
import com.google.gxp.base.MarkupClosure;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -48,7 +44,7 @@ import java.util.Map;
*/
public abstract class AbstractGxp<T extends MarkupClosure> {
- ValueStackFactory valueStackFactory;
+ org.apache.struts2.xwork2.util.ValueStackFactory valueStackFactory;
Map defaultValues = new HashMap();
List<Param> params;
Class gxpClass;
@@ -160,7 +156,7 @@ public abstract class AbstractGxp<T exte
*/
List getArgListFromValueStack(Map overrides) {
- ValueStack valueStack = valueStackFactory.createValueStack(ActionContext.getContext().getValueStack());
+ org.apache.struts2.xwork2.util.ValueStack valueStack = valueStackFactory.createValueStack(org.apache.struts2.xwork2.ActionContext.getContext().getValueStack());
// add default values to the bottom of the stack. if no action provides
// a getter for a param, the default value will be used.
@@ -341,8 +337,8 @@ public abstract class AbstractGxp<T exte
return paramType.isAssignableFrom(argClass);
}
- @Inject
- public void setValueStackFactory(ValueStackFactory valueStackFactory) {
+ @org.apache.struts2.xwork2.inject.Inject
+ public void setValueStackFactory(org.apache.struts2.xwork2.util.ValueStackFactory valueStackFactory) {
this.valueStackFactory = valueStackFactory;
}
}
Modified: struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,6 @@
*/
package org.apache.struts2.views.gxp;
-import com.opensymphony.xwork2.Result;
import org.apache.struts2.ServletActionContext;
import javax.servlet.http.HttpServletResponse;
@@ -52,7 +51,7 @@ import java.util.Locale;
* </result-types>
* </pre>
* This means that Struts 2 will attempt to instantiate the {@code Interface}
- * using the {@link com.opensymphony.xwork2.ObjectFactory}. If
+ * using the {@link org.apache.struts2.xwork2.ObjectFactory}. If
* {@link com.google.webwork.GuiceWebWorkIntegrationModule} is installed, or
* {@link com.google.webwork.ContainerObjectFactory} is set as the static
* {@code ObjectFactory} instance, then Guice will be used to instantiate the
@@ -60,7 +59,7 @@ import java.util.Locale;
*
* @author Bob Lee
*/
-public abstract class AbstractGxpResult implements Result {
+public abstract class AbstractGxpResult implements org.apache.struts2.xwork2.Result {
private boolean useInstances = false;
private String gxpName;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpInstance.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpInstance.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpInstance.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpInstance.java Fri Dec 2 16:33:03 2011
@@ -22,8 +22,6 @@ package org.apache.struts2.views.gxp;
import com.google.common.base.Function;
import com.google.common.collect.MapMaker;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.inject.Inject;
import java.util.Map;
import java.util.logging.Level;
@@ -31,7 +29,7 @@ import java.util.logging.Logger;
/**
* Struts 2 to GXP adapter that uses instances of GXP Interfaces, as created by
- * the {@link ObjectFactory}. Can be used to write a GXP or create a
+ * the {@link org.apache.struts2.xwork2.ObjectFactory}. Can be used to write a GXP or create a
* HtmlClosure. Pulls non-constructor GXP parameters from Struts 2 value stack.
*
* @author David P. Baker
@@ -42,7 +40,7 @@ public class GxpInstance extends Gxp {
private Class<?> gxpInterface;
private Class<?> gxpInstance;
- private ObjectFactory objectFactory;
+ private org.apache.struts2.xwork2.ObjectFactory objectFactory;
GxpInstance(Class<?> gxpClass) {
super(gxpClass,
@@ -63,7 +61,7 @@ public class GxpInstance extends Gxp {
/**
* {@inheritDoc}
- * <p> This implementation uses the {@link ObjectFactory} to try to create an
+ * <p> This implementation uses the {@link org.apache.struts2.xwork2.ObjectFactory} to try to create an
* instance of the {@code Interface} class that is nested within the GXP
* class. If that doesn't work, it falls back to trying to use the
* {@code ObjectFactory} to create an instance of the nested {@code Instance}
@@ -130,8 +128,8 @@ public class GxpInstance extends Gxp {
return classToGxpInstance.get(gxpClass);
}
- @Inject
- public void setObjectFactory(ObjectFactory objectFactory) {
+ @org.apache.struts2.xwork2.inject.Inject
+ public void setObjectFactory(org.apache.struts2.xwork2.ObjectFactory objectFactory) {
this.objectFactory = objectFactory;
}
Modified: struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java Fri Dec 2 16:33:03 2011
@@ -22,9 +22,6 @@ package org.apache.struts2.views.gxp;
import com.google.gxp.base.GxpContext;
import com.google.gxp.html.HtmlClosure;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
import java.io.IOException;
@@ -70,7 +67,7 @@ public class GxpResult extends AbstractG
*/
public static final String DEFAULT_PARAM = "gxpName";
- private Container container;
+ private org.apache.struts2.xwork2.inject.Container container;
private boolean outputXml = false;
/**
@@ -102,7 +99,7 @@ public class GxpResult extends AbstractG
/**
* Tells the GXP to write itself to the output stream.
*/
- public void execute(ActionInvocation actionInvocation) {
+ public void execute(org.apache.struts2.xwork2.ActionInvocation actionInvocation) {
GxpResourceProvider provider = getProvider();
try {
getGxpClosure().write(provider.getWriter(), new GxpContext(provider.getLocale(), outputXml));
@@ -138,8 +135,8 @@ public class GxpResult extends AbstractG
}
}
- @Inject
- public void setContainer(Container container) {
+ @org.apache.struts2.xwork2.inject.Inject
+ public void setContainer(org.apache.struts2.xwork2.inject.Container container) {
this.container = container;
}
}
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java Fri Dec 2 16:33:03 2011
@@ -21,10 +21,10 @@
package org.apache.struts2.views.jasperreports;
-import com.opensymphony.xwork2.ActionInvocation;
-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.ActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JRExporter;
import net.sf.jasperreports.engine.JRExporterParameter;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java Fri Dec 2 16:33:03 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.views.jasperreports;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JRField;
import net.sf.jasperreports.engine.JRRewindableDataSource;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackShadowMap.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jasperreports;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import java.util.HashMap;
import java.util.Set;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTagHandlerFactory.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.views.java;
-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;
/**
* Default implementation of TagHandlerFactory
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/DefaultTheme.java Fri Dec 2 16:33:03 2011
@@ -28,8 +28,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-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;
/**
* Default implementation of the theme
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/JavaTemplateEngine.java Fri Dec 2 16:33:03 2011
@@ -29,10 +29,10 @@ import org.apache.struts2.views.java.sim
import java.util.HashMap;
import java.util.StringTokenizer;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.inject.Inject;
/**
* Template engine that renders tags using java implementations
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.components.template.TemplateRenderingContext;
import org.apache.struts2.components.Component;
import org.apache.struts2.views.java.Attributes;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.util.MakeIterator;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java Fri Dec 2 16:33:03 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.util.MakeIterator;
import org.apache.struts2.views.java.Attributes;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SelectHandler.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.apache.struts2.components.ListUIBean;
import org.apache.struts2.components.OptGroup;
import org.apache.struts2.util.ContainUtil;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java Fri Dec 2 16:33:03 2011
@@ -21,10 +21,10 @@
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
+import org.apache.struts2.xwork2.inject.Container;
+import org.apache.struts2.xwork2.util.ValueStack;
import junit.framework.TestCase;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.ServletActionContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/TokenTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/TokenTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/TokenTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/TokenTest.java Fri Dec 2 16:33:03 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.views.java.simple;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
import org.apache.struts2.components.Token;
import org.apache.struts2.components.UIBean;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java Fri Dec 2 16:33:03 2011
@@ -22,9 +22,9 @@
package org.apache.struts2.dispatcher;
import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.jfree.chart.ChartUtilities;
import org.jfree.chart.JFreeChart;
@@ -171,7 +171,7 @@ public class ChartResult extends StrutsR
// OTHER METHODS -----------------------
- // Required by com.opensymphony.xwork2.Result
+ // Required by org.apache.struts2.xwork2.Result
/**
* Executes the result. Writes the given chart as a PNG or JPG to the servlet output stream.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java Fri Dec 2 16:33:03 2011
@@ -23,12 +23,12 @@ package org.apache.struts2.dispatcher;
import org.apache.struts2.ServletActionContext;
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.easymock.EasyMock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.util.ValueStack;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
import org.jfree.data.general.DefaultPieDataset;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java Fri Dec 2 16:33:03 2011
@@ -23,9 +23,9 @@ package org.apache.struts2.jsf;
import javax.faces.context.FacesContext;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
/**
* Translates JSF phases into individual interceptors, and adapts their expected
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java Fri Dec 2 16:33:03 2011
@@ -27,8 +27,8 @@ import javax.faces.context.FacesContext;
import org.apache.struts2.dispatcher.StrutsResultSupport;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Result;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.Result;
/**
* Executes the JSF render phase
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java Fri Dec 2 16:33:03 2011
@@ -46,11 +46,11 @@ import org.apache.struts2.ServletActionC
import org.apache.struts2.StrutsException;
import org.apache.struts2.util.ClassLoaderUtils;
-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;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
/**
* * Initializes the JSF context for this request.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java Fri Dec 2 16:33:03 2011
@@ -27,9 +27,9 @@ import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
import javax.faces.lifecycle.Lifecycle;
-import com.opensymphony.xwork2.ActionContext;
-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.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* Provides common lifecycle phase methods needed by interceptors and results.
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java Fri Dec 2 16:33:03 2011
@@ -26,9 +26,9 @@ import java.util.Map;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
/**
* Overrides the JFS navigation by delegating the result to handling by the core
Modified: struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java Fri Dec 2 16:33:03 2011
@@ -25,8 +25,7 @@ import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
-import com.opensymphony.xwork2.ognl.OgnlValueStack;
-import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionContext;
/**
* Will return a reference to the current action if the action name matches the
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONCleaner.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONCleaner.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONCleaner.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONCleaner.java Fri Dec 2 16:33:03 2011
@@ -28,12 +28,11 @@ import java.util.TreeMap;
import java.util.HashMap;
import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.WildcardUtil;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.WildcardUtil;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* <p>Isolate the process of cleaning JSON data from the Interceptor class
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java Fri Dec 2 16:33:03 2011
@@ -25,7 +25,6 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -42,14 +41,14 @@ import org.apache.struts2.json.rpc.RPCEr
import org.apache.struts2.json.rpc.RPCErrorCode;
import org.apache.struts2.json.rpc.RPCResponse;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.WildcardUtil;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.interceptor.AbstractInterceptor;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.WildcardUtil;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
/**
* Populates an action from a JSON string
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONPopulator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONPopulator.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONPopulator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONPopulator.java Fri Dec 2 16:33:03 2011
@@ -48,8 +48,8 @@ import java.util.Set;
import org.apache.struts2.json.annotations.JSON;
-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;
/**
* Isolate the process of populating JSON objects from the Interceptor class
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java Fri Dec 2 16:33:03 2011
@@ -20,14 +20,14 @@
*/
package org.apache.struts2.json;
-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.ValueStack;
-import com.opensymphony.xwork2.util.WildcardUtil;
-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.ValueStack;
+import org.apache.struts2.xwork2.util.WildcardUtil;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.json.smd.SMDGenerator;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java Fri Dec 2 16:33:03 2011
@@ -20,10 +20,10 @@
*/
package org.apache.struts2.json;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.WildcardUtil;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.WildcardUtil;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.json.annotations.SMDMethod;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java Fri Dec 2 16:33:03 2011
@@ -21,13 +21,13 @@
package org.apache.struts2.json;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ModelDriven;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.interceptor.MethodFilterInterceptor;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.struts2.ServletActionContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java Fri Dec 2 16:33:03 2011
@@ -20,8 +20,8 @@
*/
package org.apache.struts2.json;
-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;
import org.apache.struts2.json.annotations.JSON;
import org.apache.struts2.json.annotations.JSONFieldBridge;
import org.apache.struts2.json.annotations.JSONParameter;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCError.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCError.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCError.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCError.java Fri Dec 2 16:33:03 2011
@@ -23,8 +23,8 @@ package org.apache.struts2.json.rpc;
import java.io.PrintWriter;
import java.io.StringWriter;
-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;
/*
* Used to serialize RPC Errors
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java Fri Dec 2 16:33:03 2011
@@ -1,9 +1,9 @@
package org.apache.struts2.json.smd;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-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.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.json.JSONUtil;
import org.apache.struts2.json.annotations.SMD;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java Fri Dec 2 16:33:03 2011
@@ -26,14 +26,13 @@ import java.util.Map;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-
public class JSONInterceptorTest extends StrutsTestCase {
private MockActionInvocationEx invocation;
private MockHttpServletRequest request;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java Fri Dec 2 16:33:03 2011
@@ -38,14 +38,13 @@ import javax.servlet.http.HttpServletRes
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.util.ValueStack;
-
/**
* JSONResultTest
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java Fri Dec 2 16:33:03 2011
@@ -21,16 +21,16 @@
package org.apache.struts2.json;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.mock.MockActionProxy;
-import com.opensymphony.xwork2.validator.annotations.EmailValidator;
-import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
-import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
-import com.opensymphony.xwork2.validator.annotations.Validation;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.xwork2.mock.MockActionProxy;
+import org.apache.struts2.xwork2.validator.annotations.EmailValidator;
+import org.apache.struts2.xwork2.validator.annotations.IntRangeFieldValidator;
+import org.apache.struts2.xwork2.validator.annotations.StringLengthFieldValidator;
+import org.apache.struts2.xwork2.validator.annotations.Validation;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java Fri Dec 2 16:33:03 2011
@@ -27,8 +27,8 @@ import java.util.Set;
import org.apache.struts2.json.annotations.JSON;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.Action;
+import org.apache.struts2.xwork2.ActionSupport;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java Fri Dec 2 16:33:03 2011
@@ -21,17 +21,21 @@
package org.apache.struts2;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.interceptor.annotations.After;
-import com.opensymphony.xwork2.interceptor.annotations.Before;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.interceptor.annotations.After;
+import org.apache.struts2.xwork2.interceptor.annotations.Before;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.jdk.JdkLoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.util.StrutsTestCaseHelper;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.ValidationAware;
+import org.apache.struts2.xwork2.XWorkJUnit4TestCase;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java?rev=1209569&r1=1209568&r2=1209569&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java Fri Dec 2 16:33:03 2011
@@ -21,13 +21,13 @@
package org.apache.struts2;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.ActionProxyFactory;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.util.logging.jdk.JdkLoggerFactory;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;