You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/02 12:25:26 UTC
svn commit: r1209415 [8/19] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mail...
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java Fri Dec 2 11:24:48 2011
@@ -25,6 +25,8 @@ import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import junit.framework.TestCase;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.StrutsTestCase;
@@ -34,11 +36,14 @@ import org.apache.struts2.dispatcher.map
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.core.io.DefaultResourceLoader;
import org.easymock.EasyMock;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.mock.MockActionInvocation;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import javax.servlet.ServletContext;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java Fri Dec 2 11:24:48 2011
@@ -23,11 +23,15 @@ package org.apache.struts2.views.freemar
import java.util.List;
+import junit.framework.TestCase;
+
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.util.ListEntry;
import org.apache.struts2.util.StrutsUtil;
-import org.apache.struts2.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import freemarker.ext.beans.CollectionModel;
import freemarker.template.ObjectWrapper;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java Fri Dec 2 11:24:48 2011
@@ -24,7 +24,7 @@ package org.apache.struts2.views.freemar
import java.util.ArrayList;
import java.util.List;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/freemarker/tags/TagModelTest.java Fri Dec 2 11:24:48 2011
@@ -30,11 +30,12 @@ import java.util.Map;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.components.Component;
+import org.apache.struts2.views.freemarker.tags.TagModel;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ognl.OgnlValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
import freemarker.ext.util.WrapperTemplateModel;
import freemarker.template.AdapterTemplateModel;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java Fri Dec 2 11:24:48 2011
@@ -38,10 +38,11 @@ import org.apache.struts2.dispatcher.Req
import org.apache.struts2.dispatcher.SessionMap;
import com.mockobjects.dynamic.Mock;
-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;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java Fri Dec 2 11:24:48 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.views.jsp;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java Fri Dec 2 11:24:48 2011
@@ -34,11 +34,11 @@ import org.apache.struts2.TestConfigurat
import org.apache.struts2.components.ActionComponent;
import com.mockobjects.dynamic.Mock;
-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 com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java Fri Dec 2 11:24:48 2011
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Test case for AppendIteratorTag.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java Fri Dec 2 11:24:48 2011
@@ -23,14 +23,18 @@ package org.apache.struts2.views.jsp;
import javax.servlet.jsp.tagext.TagSupport;
+import junit.framework.TestCase;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.components.If;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java Fri Dec 2 11:24:48 2011
@@ -30,8 +30,9 @@ import org.apache.struts2.components.If;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java Fri Dec 2 11:24:48 2011
@@ -21,13 +21,14 @@
package org.apache.struts2.views.jsp;
+import org.apache.struts2.TestAction;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
import com.mockobjects.servlet.MockPageContext;
import com.mockobjects.servlet.MockJspWriter;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java Fri Dec 2 11:24:48 2011
@@ -24,13 +24,16 @@ package org.apache.struts2.views.jsp;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
+import junit.framework.TestCase;
+
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsTestCase;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java Fri Dec 2 11:24:48 2011
@@ -26,8 +26,8 @@ import java.util.Iterator;
import org.apache.struts2.util.IteratorGenerator.Converter;
import org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Test case for IteratorGeneratorTag.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java Fri Dec 2 11:24:48 2011
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Test case for MergeIteratorTag.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java Fri Dec 2 11:24:48 2011
@@ -31,8 +31,9 @@ import org.apache.struts2.StrutsTestCase
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java Fri Dec 2 11:24:48 2011
@@ -30,8 +30,8 @@ import javax.servlet.jsp.JspException;
import org.apache.struts2.views.jsp.iterator.SortIteratorTag;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Test case to test SortIteratorTag.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java Fri Dec 2 11:24:48 2011
@@ -28,8 +28,8 @@ import java.util.List;
import org.apache.struts2.util.SubsetIteratorFilter.Decider;
import org.apache.struts2.views.jsp.iterator.SubsetIteratorTag;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java Fri Dec 2 11:24:48 2011
@@ -38,10 +38,10 @@ import org.apache.struts2.views.jsp.ui.S
import org.apache.struts2.views.jsp.ui.TestAction1;
import com.mockobjects.servlet.MockJspWriter;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.util.ValueStack;
-import org.apache.struts2.xwork2.util.ValueStackFactory;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java Fri Dec 2 11:24:48 2011
@@ -41,11 +41,14 @@ import org.apache.struts2.dispatcher.map
import org.apache.struts2.dispatcher.mapper.DefaultActionMapper;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionProxy;
-import org.apache.struts2.xwork2.DefaultActionInvocation;
-import org.apache.struts2.xwork2.DefaultActionProxyFactory;
-import org.apache.struts2.xwork2.inject.Container;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.DefaultActionInvocation;
+import com.opensymphony.xwork2.DefaultActionProxy;
+import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.inject.Container;
/**
* Unit test for {@link URLTag}.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java Fri Dec 2 11:24:48 2011
@@ -21,8 +21,8 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java Fri Dec 2 11:24:48 2011
@@ -21,8 +21,8 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.views.jsp.AbstractTagTest;
import org.apache.struts2.views.jsp.DateTag;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleValidationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleValidationAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleValidationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleValidationAction.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java Fri Dec 2 11:24:48 2011
@@ -31,8 +31,8 @@ import org.apache.struts2.views.jsp.Abst
import org.apache.struts2.views.jsp.ParamTag;
import org.apache.struts2.TestAction;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
* FieldError Tag Test Case.
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Fri Dec 2 11:24:48 2011
@@ -35,14 +35,14 @@ import org.apache.struts2.views.jsp.Abst
import org.apache.struts2.views.jsp.ActionTag;
import org.easymock.EasyMock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.RuntimeConfiguration;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
-import org.apache.struts2.xwork2.config.impl.DefaultConfiguration;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Scope.Strategy;
-import org.apache.struts2.xwork2.validator.ValidationInterceptor;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.RuntimeConfiguration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorMapping;
+import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Scope.Strategy;
+import com.opensymphony.xwork2.validator.ValidationInterceptor;
/**
@@ -197,7 +197,7 @@ public class FormTagTest extends Abstrac
final Container cont = container;
// used to determined if the form action needs js validation
- configurationManager.setConfiguration(new org.apache.struts2.xwork2.config.impl.DefaultConfiguration() {
+ configurationManager.setConfiguration(new com.opensymphony.xwork2.config.impl.DefaultConfiguration() {
private DefaultConfiguration self = this;
public Container getContainer() {
return new Container() {
@@ -278,7 +278,7 @@ public class FormTagTest extends Abstrac
*/
public void testFormWithCustomOnsubmitEnabledWithValidateEnabled2() throws Exception {
- org.apache.struts2.xwork2.config.Configuration originalConfiguration = configurationManager.getConfiguration();
+ com.opensymphony.xwork2.config.Configuration originalConfiguration = configurationManager.getConfiguration();
ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory();
final Container cont = container;
@@ -368,7 +368,7 @@ public class FormTagTest extends Abstrac
final Container cont = container;
// used to determined if the form action needs js validation
- configurationManager.setConfiguration(new org.apache.struts2.xwork2.config.impl.DefaultConfiguration() {
+ configurationManager.setConfiguration(new com.opensymphony.xwork2.config.impl.DefaultConfiguration() {
private DefaultConfiguration self = this;
public Container getContainer() {
return new Container() {
@@ -449,7 +449,7 @@ public class FormTagTest extends Abstrac
final Container cont = container;
// used to determined if the form action needs js validation
- configurationManager.setConfiguration(new org.apache.struts2.xwork2.config.impl.DefaultConfiguration() {
+ configurationManager.setConfiguration(new com.opensymphony.xwork2.config.impl.DefaultConfiguration() {
private DefaultConfiguration self = this;
public Container getContainer() {
return new Container() {
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/IntValidationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/IntValidationAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/IntValidationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/IntValidationAction.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
* TestAction1
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java Fri Dec 2 11:24:48 2011
@@ -28,8 +28,8 @@ import java.util.Map;
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Test case for UpDownSelectTag
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java Fri Dec 2 11:24:48 2011
@@ -21,14 +21,17 @@
package org.apache.struts2.views.util;
+import junit.framework.TestCase;
+
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsTestCase;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
* Test case for ContextUtil
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java Fri Dec 2 11:24:48 2011
@@ -21,10 +21,13 @@
package org.apache.struts2.views.util;
+import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Scope.Strategy;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Scope.Strategy;
+import com.opensymphony.xwork2.util.ValueStack;
import java.util.HashMap;
import java.util.LinkedHashMap;
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java Fri Dec 2 11:24:48 2011
@@ -36,10 +36,11 @@ import org.springframework.mock.web.Mock
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-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.ValueStack;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
/**
* Unit test for {@link XSLTResult}.
@@ -205,7 +206,7 @@ public class XSLTResultTest extends Stru
MyAction action = new MyAction();
- mai = new org.apache.struts2.xwork2.mock.MockActionInvocation();
+ mai = new com.opensymphony.xwork2.mock.MockActionInvocation();
mai.setAction(action);
mai.setStack(stack);
mai.setInvocationContext(ActionContext.getContext());
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/resources/XSLTResultTest-val.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/resources/XSLTResultTest-val.xml?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/resources/XSLTResultTest-val.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/resources/XSLTResultTest-val.xml Fri Dec 2 11:24:48 2011
@@ -22,17 +22,17 @@
*/
-->
<validators>
- <validator name="required" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
- <validator name="requiredstring" class="org.apache.struts2.xwork2.validator.validators.RequiredStringValidator"/>
- <validator name="int" class="org.apache.struts2.xwork2.validator.validators.IntRangeFieldValidator"/>
- <validator name="double" class="org.apache.struts2.xwork2.validator.validators.DoubleRangeFieldValidator"/>
- <validator name="date" class="org.apache.struts2.xwork2.validator.validators.DateRangeFieldValidator"/>
- <validator name="expression" class="org.apache.struts2.xwork2.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression" class="org.apache.struts2.xwork2.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="org.apache.struts2.xwork2.validator.validators.EmailValidator"/>
- <validator name="url" class="org.apache.struts2.xwork2.validator.validators.URLValidator"/>
- <validator name="visitor" class="org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator"/>
- <validator name="conversion" class="org.apache.struts2.xwork2.validator.validators.ConversionErrorFieldValidator"/>
- <validator name="stringlength" class="org.apache.struts2.xwork2.validator.validators.StringLengthFieldValidator"/>
- <validator name="regex" class="org.apache.struts2.xwork2.validator.validators.RegexFieldValidator"/>
+ <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
+ <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
</validators>
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/resources/struts.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/resources/struts.xml?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/resources/struts.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/resources/struts.xml Fri Dec 2 11:24:48 2011
@@ -25,7 +25,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
<package name="default" extends="struts-default">
- <action name="hello" class="org.apache.struts2.xwork2.ActionSupport">
+ <action name="hello" class="com.opensymphony.xwork2.ActionSupport">
<result name="success">hello.jsp</result>
<result name="tutorial" type="redirect">/tutorial/test.action</result>
</action>
@@ -37,17 +37,17 @@
class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
</result-types>
- <action name="test" class="org.apache.struts2.xwork2.ActionSupport">
+ <action name="test" class="com.opensymphony.xwork2.ActionSupport">
<result name="input">sitegraph/guess-input.ftl</result>
</action>
- <action name="test2" class="org.apache.struts2.xwork2.ActionSupport">
+ <action name="test2" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">
<param name="location">org/apache/struts2/views/freemarker/callActionFreeMarker.ftl</param>
</result>
</action>
- <action name="test3" class="org.apache.struts2.xwork2.ActionSupport">
+ <action name="test3" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">org/apache/struts2/views/freemarker/nested.ftl</result>
</action>
@@ -57,7 +57,7 @@
</result>
</action>
- <action name="test5" class="org.apache.struts2.xwork2.ActionSupport">
+ <action name="test5" class="com.opensymphony.xwork2.ActionSupport">
<result type="freemarker">
<param name="location">org/apache/struts2/views/freemarker/callActionFreeMarker2.ftl</param>
</result>
@@ -71,7 +71,7 @@
class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
</result-types>
- <action name="guess" class="org.apache.struts2.xwork2.ActionSupport">
+ <action name="guess" class="com.opensymphony.xwork2.ActionSupport">
<result name="success" type="redirect">guess-success.jsp</result>
<result name="input">guess-input.ftl</result>
<result name="error">guess-error.ftl</result>
Modified: struts/struts2/branches/STRUTS_3_X/core/src/test/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/core/src/test/resources/validators.xml?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/core/src/test/resources/validators.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/core/src/test/resources/validators.xml Fri Dec 2 11:24:48 2011
@@ -25,17 +25,17 @@
"-//Apache Struts//XWork Validator Config 1.0//EN"
"http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
<validators>
- <validator name="required" class="org.apache.struts2.xwork2.validator.validators.RequiredFieldValidator"/>
- <validator name="requiredstring" class="org.apache.struts2.xwork2.validator.validators.RequiredStringValidator"/>
- <validator name="int" class="org.apache.struts2.xwork2.validator.validators.IntRangeFieldValidator"/>
- <validator name="double" class="org.apache.struts2.xwork2.validator.validators.DoubleRangeFieldValidator"/>
- <validator name="date" class="org.apache.struts2.xwork2.validator.validators.DateRangeFieldValidator"/>
- <validator name="expression" class="org.apache.struts2.xwork2.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression" class="org.apache.struts2.xwork2.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="org.apache.struts2.xwork2.validator.validators.EmailValidator"/>
- <validator name="url" class="org.apache.struts2.xwork2.validator.validators.URLValidator"/>
- <validator name="visitor" class="org.apache.struts2.xwork2.validator.validators.VisitorFieldValidator"/>
- <validator name="conversion" class="org.apache.struts2.xwork2.validator.validators.ConversionErrorFieldValidator"/>
- <validator name="stringlength" class="org.apache.struts2.xwork2.validator.validators.StringLengthFieldValidator"/>
- <validator name="regex" class="org.apache.struts2.xwork2.validator.validators.RegexFieldValidator"/>
+ <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
+ <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
</validators>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java Fri Dec 2 11:24:48 2011
@@ -19,9 +19,9 @@
package org.apache.struts2.cdi;
-import org.apache.struts2.xwork2.ObjectFactory;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.BeanManager;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/resources/struts-plugin.xml?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/resources/struts-plugin.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/cdi/src/main/resources/struts-plugin.xml Fri Dec 2 11:24:48 2011
@@ -25,7 +25,7 @@
<struts>
- <bean type="org.apache.struts2.xwork2.ObjectFactory" name="cdi" class="org.apache.struts2.cdi.CdiObjectFactory" />
+ <bean type="com.opensymphony.xwork2.ObjectFactory" name="cdi" class="org.apache.struts2.cdi.CdiObjectFactory" />
<!-- Make the CDI object factory the automatic default -->
<constant name="struts.objectFactory" value="cdi" />
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java Fri Dec 2 11:24:48 2011
@@ -21,14 +21,14 @@
package org.apache.struts2.codebehind;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.entities.*;
-import org.apache.struts2.xwork2.config.providers.InterceptorBuilder;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.*;
+import com.opensymphony.xwork2.config.providers.InterceptorBuilder;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.util.ClassLoaderUtils;
import javax.servlet.ServletContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java Fri Dec 2 11:24:48 2011
@@ -21,20 +21,20 @@
package org.apache.struts2.config;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.PackageProvider;
-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.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ClassLoaderUtil;
-import org.apache.struts2.xwork2.util.ResolverUtil;
-import org.apache.struts2.xwork2.util.ResolverUtil.ClassTest;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.PackageProvider;
+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.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ResolverUtil;
+import com.opensymphony.xwork2.util.ResolverUtil.ClassTest;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import javax.servlet.ServletContext;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.config;
-import org.apache.struts2.xwork2.Action;
+import com.opensymphony.xwork2.Action;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -35,7 +35,7 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE)
public @interface Result {
String name() default Action.SUCCESS;
- Class<? extends org.apache.struts2.xwork2.Result> type() default NullResult.class;
+ Class<? extends com.opensymphony.xwork2.Result> type() default NullResult.class;
String value();
String[] params() default {};
}
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/resources/struts-plugin.xml?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/resources/struts-plugin.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/main/resources/struts-plugin.xml Fri Dec 2 11:24:48 2011
@@ -26,8 +26,8 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <bean type="org.apache.struts2.xwork2.UnknownHandler" class="org.apache.struts2.codebehind.CodebehindUnknownHandler" />
- <bean type="org.apache.struts2.xwork2.config.PackageProvider" name="codebehind" class="org.apache.struts2.config.ClasspathPackageProvider" />
+ <bean type="com.opensymphony.xwork2.UnknownHandler" class="org.apache.struts2.codebehind.CodebehindUnknownHandler" />
+ <bean type="com.opensymphony.xwork2.config.PackageProvider" name="codebehind" class="org.apache.struts2.config.ClasspathPackageProvider" />
<constant name="struts.codebehind.pathPrefix" value="/"/>
<constant name="struts.codebehind.defaultPackage" value="codebehind-default"/>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java Fri Dec 2 11:24:48 2011
@@ -23,10 +23,10 @@ package org.apache.struts2.codebehind;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts2.xwork2.*;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.util.XWorkTestCaseHelper;
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.ServletDispatcherResult;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java Fri Dec 2 11:24:48 2011
@@ -21,11 +21,11 @@
package org.apache.struts2.config;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
import junit.framework.TestCase;
import org.apache.struts2.dispatcher.ServletDispatcherResult;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java Fri Dec 2 11:24:48 2011
@@ -21,7 +21,7 @@
package org.apache.struts2.config.cltest;
-import org.apache.struts2.xwork2.Action;
+import com.opensymphony.xwork2.Action;
public class ActionImpl implements Action {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/parenttest/SomeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/parenttest/SomeAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/parenttest/SomeAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/codebehind/src/test/java/org/apache/struts2/config/parenttest/SomeAction.java Fri Dec 2 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.config.parenttest;
-import org.apache.struts2.xwork2.Action;
+import com.opensymphony.xwork2.Action;
public class SomeAction implements Action {
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java Fri Dec 2 11:24:48 2011
@@ -21,9 +21,9 @@
package org.apache.struts2.config_browser;
-import org.apache.struts2.xwork2.ActionSupport;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
import org.apache.struts2.StrutsConstants;
import java.util.Set;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java Fri Dec 2 11:24:48 2011
@@ -25,15 +25,20 @@ import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ResolverUtil;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.util.ClassLoaderUtils;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ResolverUtil;
/**
* ConfigurationHelper
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java Fri Dec 2 11:24:48 2011
@@ -21,11 +21,11 @@
package org.apache.struts2.config_browser;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionSupport;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.validator.ActionValidatorManager;
-import org.apache.struts2.xwork2.validator.Validator;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.validator.ActionValidatorManager;
+import com.opensymphony.xwork2.validator.Validator;
import org.apache.struts2.util.ClassLoaderUtils;
import java.util.Collections;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java Fri Dec 2 11:24:48 2011
@@ -33,13 +33,13 @@ import org.apache.struts2.dispatcher.mul
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.velocity.VelocityManager;
-import org.apache.struts2.xwork2.ActionProxyFactory;
-import org.apache.struts2.xwork2.ObjectFactory;
-import org.apache.struts2.xwork2.TextProvider;
-import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer;
-import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
/**
* Shows the beans loaded by the internal Guice container. Only shows beans that are recognized by Struts as official
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java Fri Dec 2 11:24:48 2011
@@ -25,12 +25,12 @@ import java.beans.PropertyDescriptor;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.struts2.xwork2.ObjectFactory;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
-import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
/**
* ShowConfigAction
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java Fri Dec 2 11:24:48 2011
@@ -24,8 +24,8 @@ package org.apache.struts2.config_browse
import java.util.HashMap;
import java.util.Map;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
/**
* Shows all constants as loaded by Struts
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java Fri Dec 2 11:24:48 2011
@@ -24,13 +24,15 @@ package org.apache.struts2.config_browse
import java.io.IOException;
import java.net.URL;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
/**
* Shows all constants as loaded by Struts
Modified: struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java Fri Dec 2 11:24:48 2011
@@ -30,13 +30,13 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
-import org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory;
-import org.apache.struts2.xwork2.util.reflection.ReflectionException;
-import org.apache.struts2.xwork2.util.reflection.ReflectionProvider;
-import org.apache.struts2.xwork2.validator.Validator;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
+import com.opensymphony.xwork2.util.reflection.ReflectionException;
+import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
+import com.opensymphony.xwork2.validator.Validator;
/**
* ShowValidatorAction
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java Fri Dec 2 11:24:48 2011
@@ -20,13 +20,13 @@
*/
package org.apache.struts2.convention;
-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.inject.ContainerBuilder;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.util.location.LocatableProperties;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
import org.apache.struts2.dispatcher.DispatcherListener;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.StrutsConstants;
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathPackageProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathPackageProvider.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathPackageProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathPackageProvider.java Fri Dec 2 11:24:48 2011
@@ -19,11 +19,11 @@
* under the License.
*/package org.apache.struts2.convention;
-import org.apache.struts2.xwork2.config.PackageProvider;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.inject.Container;
+import com.opensymphony.xwork2.config.PackageProvider;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.inject.Container;
/**
* <p>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java Fri Dec 2 11:24:48 2011
@@ -25,23 +25,23 @@ import java.util.*;
import javax.servlet.ServletContext;
-import org.apache.struts2.xwork2.config.entities.*;
-import org.apache.struts2.xwork2.config.providers.InterceptorBuilder;
+import com.opensymphony.xwork2.config.entities.*;
+import com.opensymphony.xwork2.config.providers.InterceptorBuilder;
import org.apache.struts2.util.ClassLoaderUtils;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.ActionSupport;
-import org.apache.struts2.xwork2.ObjectFactory;
-import org.apache.struts2.xwork2.Result;
-import org.apache.struts2.xwork2.UnknownHandler;
-import org.apache.struts2.xwork2.XWorkException;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.Result;
+import com.opensymphony.xwork2.UnknownHandler;
+import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <p>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsService.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsService.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsService.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsService.java Fri Dec 2 11:24:48 2011
@@ -22,9 +22,9 @@ package org.apache.struts2.convention;
import java.util.Map;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
/**
* <p>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java Fri Dec 2 11:24:48 2011
@@ -28,11 +28,11 @@ import org.apache.struts2.convention.ann
import org.apache.struts2.convention.annotation.ResultPath;
import org.apache.struts2.util.ClassLoaderUtils;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.entities.ActionConfig;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.inject.Inject;
/**
* <p>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java Fri Dec 2 11:24:48 2011
@@ -20,7 +20,7 @@
*/
package org.apache.struts2.convention;
-import org.apache.struts2.xwork2.inject.Inject;
+import com.opensymphony.xwork2.inject.Inject;
import org.apache.commons.lang.StringUtils;
/**
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java Fri Dec 2 11:24:48 2011
@@ -21,6 +21,7 @@
package org.apache.struts2.convention;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,14 +30,16 @@ import org.apache.struts2.convention.ann
import org.apache.struts2.convention.annotation.InterceptorRef;
import org.apache.struts2.convention.annotation.InterceptorRefs;
-import org.apache.struts2.xwork2.ObjectFactory;
-import org.apache.struts2.xwork2.config.Configuration;
-import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.providers.InterceptorBuilder;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.InterceptorMapping;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.providers.InterceptorBuilder;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.AnnotationUtils;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <p>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java Fri Dec 2 11:24:48 2011
@@ -35,20 +35,20 @@ import org.apache.commons.lang.StringUti
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
-import org.apache.struts2.xwork2.Action;
-import org.apache.struts2.xwork2.ActionContext;
-import org.apache.struts2.xwork2.config.ConfigurationException;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import org.apache.struts2.xwork2.config.entities.ResultConfig;
-import org.apache.struts2.xwork2.config.entities.ResultTypeConfig;
-import org.apache.struts2.xwork2.inject.Container;
-import org.apache.struts2.xwork2.inject.Inject;
-import org.apache.struts2.xwork2.util.finder.ClassLoaderInterface;
-import org.apache.struts2.xwork2.util.finder.ClassLoaderInterfaceDelegate;
-import org.apache.struts2.xwork2.util.finder.ResourceFinder;
-import org.apache.struts2.xwork2.util.finder.Test;
-import org.apache.struts2.xwork2.util.logging.Logger;
-import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
+import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
+import com.opensymphony.xwork2.util.finder.ResourceFinder;
+import com.opensymphony.xwork2.util.finder.Test;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <p>
Modified: struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/InterceptorMapBuilder.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/InterceptorMapBuilder.java?rev=1209415&r1=1209414&r2=1209415&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/InterceptorMapBuilder.java (original)
+++ struts/struts2/branches/STRUTS_3_X/plugins/convention/src/main/java/org/apache/struts2/convention/InterceptorMapBuilder.java Fri Dec 2 11:24:48 2011
@@ -24,8 +24,8 @@ import java.util.List;
import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
-import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorMapping;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
/**
* <p>