Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java Sun Jul 9 17:57:05 2006 @@ -38,7 +38,7 @@ /** * Test that the service method stores the request, response and servlet context - * in the [EMAIL PROTECTED] com.opensymphony.xwork.ActionContext} + * in the [EMAIL PROTECTED] com.opensymphony.xwork2.ActionContext} */ public void testServiceHttpServletRequestHttpServletResponse() throws Exception { MockControl mockRequest = MockControl.createNiceControl(HttpServletRequest.class);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java Sun Jul 9 17:57:05 2006 @@ -45,13 +45,13 @@ import org.apache.struts2.dispatcher.DispatcherUtils; import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.context.ServletContextHolderListener; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionInvocation; -import com.opensymphony.xwork.ActionProxy; -import com.opensymphony.xwork.ActionProxyFactory; -import com.opensymphony.xwork.config.Configuration; -import com.opensymphony.xwork.config.ConfigurationManager; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ActionProxyFactory; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.util.OgnlValueStack; /** * Jsr168DispatcherTest. Insert description. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java Sun Jul 9 17:57:05 2006 @@ -36,8 +36,8 @@ import org.jmock.core.Constraint; import org.apache.struts2.portlet.PortletActionConstants; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.ActionInvocation; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; /** * PortletResultTest. Insert description. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java Sun Jul 9 17:57:05 2006 @@ -31,7 +31,7 @@ import org.easymock.MockControl; import org.apache.struts2.portlet.context.PortletActionContext; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** */ Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java Sun Jul 9 17:57:05 2006 @@ -32,7 +32,7 @@ import org.apache.struts2.StrutsTestCase; import org.apache.struts2.util.ListEntry; import org.apache.struts2.util.StrutsUtil; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java Sun Jul 9 17:57:05 2006 @@ -19,10 +19,10 @@ import com.mockobjects.dynamic.Mock; import org.apache.struts2.StrutsTestCase; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.ActionInvocation; -import com.opensymphony.xwork.ActionProxy; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.util.OgnlValueStack; import java.util.HashMap; import java.util.Map; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java Sun Jul 9 17:57:05 2006 @@ -22,7 +22,7 @@ import junit.framework.TestCase; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java Sun Jul 9 17:57:05 2006 @@ -19,8 +19,8 @@ import org.apache.struts2.util.ListEntry; import org.apache.struts2.util.StrutsUtil; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.OgnlValueStack; import freemarker.ext.beans.CollectionModel; import freemarker.template.ObjectWrapper; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java Sun Jul 9 17:57:05 2006 @@ -17,7 +17,7 @@ */ package org.apache.struts2.views.freemarker; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.ActionSupport; import java.util.ArrayList; import java.util.List; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java Sun Jul 9 17:57:05 2006 @@ -25,9 +25,9 @@ import org.apache.struts2.dispatcher.DispatcherUtils; import org.apache.struts2.dispatcher.RequestMap; import org.apache.struts2.dispatcher.SessionMap; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.OgnlValueStack; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspWriter; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java Sun Jul 9 17:57:05 2006 @@ -19,7 +19,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.views.jsp.ui.AbstractUITag; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java Sun Jul 9 17:57:05 2006 @@ -17,8 +17,8 @@ */ package org.apache.struts2.views.jsp; -import com.opensymphony.xwork.*; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.*; +import com.opensymphony.xwork2.util.OgnlValueStack; import org.apache.struts2.ServletActionContext; import org.apache.struts2.TestAction; import org.apache.struts2.TestActionTagResult; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java Sun Jul 9 17:57:05 2006 @@ -22,8 +22,8 @@ import java.util.List; import org.apache.struts2.views.jsp.iterator.AppendIteratorTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * Test case for AppendIteratorTag. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java Sun Jul 9 17:57:05 2006 @@ -23,7 +23,7 @@ import com.mockobjects.servlet.MockPageContext; import org.apache.struts2.ServletActionContext; import org.apache.struts2.components.If; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java Sun Jul 9 17:57:05 2006 @@ -22,7 +22,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsTestCase; import org.apache.struts2.components.If; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; import javax.servlet.jsp.JspException; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java Sun Jul 9 17:57:05 2006 @@ -19,8 +19,8 @@ import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.OgnlValueStack; import org.apache.struts2.ServletActionContext; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java Sun Jul 9 17:57:05 2006 @@ -21,8 +21,8 @@ import org.apache.struts2.util.IteratorGenerator.Converter; import org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * Test case for IteratorGeneratorTag. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java Sun Jul 9 17:57:05 2006 @@ -22,8 +22,8 @@ import java.util.List; import org.apache.struts2.views.jsp.iterator.MergeIteratorTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * Test case for MergeIteratorTag. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Sun Jul 9 17:57:05 2006 @@ -47,8 +47,8 @@ import org.apache.struts2.portlet.util.PortletUrlHelper; import org.apache.struts2.views.jsp.ParamTag; import org.apache.struts2.dispatcher.DispatcherUtils; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.OgnlValueStack; import org.apache.struts2.config.Configuration; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java Sun Jul 9 17:57:05 2006 @@ -23,8 +23,8 @@ import org.apache.struts2.StrutsTestCase; import org.apache.struts2.StrutsConstants; import org.apache.struts2.config.Configuration; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.OgnlValueStack; import javax.servlet.jsp.JspException; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java Sun Jul 9 17:57:05 2006 @@ -18,8 +18,8 @@ package org.apache.struts2.views.jsp; import org.apache.struts2.views.jsp.iterator.SortIteratorTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; import java.util.ArrayList; import java.util.Comparator; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java Sun Jul 9 17:57:05 2006 @@ -23,8 +23,8 @@ import org.apache.struts2.util.SubsetIteratorFilter.Decider; import org.apache.struts2.views.jsp.iterator.SubsetIteratorTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java Sun Jul 9 17:57:05 2006 @@ -25,9 +25,9 @@ import com.mockobjects.servlet.MockBodyContent; import com.mockobjects.servlet.MockJspWriter; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.OgnlValueStack; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTag; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java Sun Jul 9 17:57:05 2006 @@ -26,7 +26,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.util.OgnlValueStack; /** * Unit test for [EMAIL PROTECTED] URLTag}. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java Sun Jul 9 17:57:05 2006 @@ -23,8 +23,8 @@ import com.mockobjects.servlet.MockHttpServletResponse; import org.apache.struts2.ServletActionContext; import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork.mock.MockActionInvocation; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.mock.MockActionInvocation; +import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java Sun Jul 9 17:57:05 2006 @@ -24,8 +24,8 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.views.jsp.ui.ActionErrorTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * ActionErrorTag test case. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java Sun Jul 9 17:57:05 2006 @@ -23,8 +23,8 @@ import java.util.List; import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * ActionMessageTag test case. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java Sun Jul 9 17:57:05 2006 @@ -18,7 +18,7 @@ package org.apache.struts2.views.jsp.ui; import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; import java.util.Locale; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java Sun Jul 9 17:57:05 2006 @@ -19,7 +19,7 @@ import org.apache.struts2.views.jsp.AbstractTagTest; import org.apache.struts2.views.jsp.DateTag; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; import java.text.DateFormat; import java.text.SimpleDateFormat; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java Sun Jul 9 17:57:05 2006 @@ -25,8 +25,8 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.views.jsp.ParamTag; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * FieldError Tag Test Case. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Sun Jul 9 17:57:05 2006 @@ -17,13 +17,13 @@ */ package org.apache.struts2.views.jsp.ui; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.ActionSupport; -import com.opensymphony.xwork.ObjectFactory; -import com.opensymphony.xwork.config.RuntimeConfiguration; -import com.opensymphony.xwork.config.entities.ActionConfig; -import com.opensymphony.xwork.config.entities.InterceptorMapping; -import com.opensymphony.xwork.validator.ValidationInterceptor; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.config.RuntimeConfiguration; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.InterceptorMapping; +import com.opensymphony.xwork2.validator.ValidationInterceptor; import org.apache.struts2.StrutsConstants; import org.apache.struts2.TestAction; import org.apache.struts2.TestConfigurationProvider; @@ -113,12 +113,12 @@ */ public void testFormWithCustomOnsubmitEnabledWithValidateEnabled1() throws Exception { - com.opensymphony.xwork.config.Configuration originalConfiguration = configurationManager.getConfiguration(); + com.opensymphony.xwork2.config.Configuration originalConfiguration = configurationManager.getConfiguration(); ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory(); try { // used to determined if the form action needs js validation - configurationManager.setConfiguration(new com.opensymphony.xwork.config.impl.DefaultConfiguration() { + configurationManager.setConfiguration(new com.opensymphony.xwork2.config.impl.DefaultConfiguration() { public RuntimeConfiguration getRuntimeConfiguration() { return new RuntimeConfiguration() { public ActionConfig getActionConfig(String namespace, String name) { @@ -196,12 +196,12 @@ */ public void testFormWithCustomOnsubmitEnabledWithValidateEnabled2() throws Exception { - com.opensymphony.xwork.config.Configuration originalConfiguration = configurationManager.getConfiguration(); + com.opensymphony.xwork2.config.Configuration originalConfiguration = configurationManager.getConfiguration(); ObjectFactory originalObjectFactory = ObjectFactory.getObjectFactory(); try { // used to determined if the form action needs js validation - configurationManager.setConfiguration(new com.opensymphony.xwork.config.impl.DefaultConfiguration() { + configurationManager.setConfiguration(new com.opensymphony.xwork2.config.impl.DefaultConfiguration() { public RuntimeConfiguration getRuntimeConfiguration() { return new RuntimeConfiguration() { public ActionConfig getActionConfig(String namespace, String name) { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java Sun Jul 9 17:57:05 2006 @@ -20,7 +20,7 @@ import java.util.Locale; import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; /** * RichTextEditor test case. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java Sun Jul 9 17:57:05 2006 @@ -17,7 +17,7 @@ */ package org.apache.struts2.views.jsp.ui; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.ActionSupport; /** * TestAction1 Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java Sun Jul 9 17:57:05 2006 @@ -19,8 +19,8 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * Test case for Tree component. Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java Sun Jul 9 17:57:05 2006 @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.struts2.views.jsp.AbstractUITagTest; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionSupport; /** * Test case for UpDownSelectTag Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java Sun Jul 9 17:57:05 2006 @@ -19,7 +19,7 @@ import org.apache.struts2.config.Configuration; import org.apache.struts2.StrutsConstants; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; /** Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java Sun Jul 9 17:57:05 2006 @@ -19,10 +19,10 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsTestCase; -import com.opensymphony.xwork.Action; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.mock.MockActionInvocation; -import com.opensymphony.xwork.util.OgnlValueStack; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.mock.MockActionInvocation; +import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.mock.web.MockHttpServletRequest; @@ -126,7 +126,7 @@ MyAction action = new MyAction(); - mai = new com.opensymphony.xwork.mock.MockActionInvocation(); + mai = new com.opensymphony.xwork2.mock.MockActionInvocation(); mai.setAction(action); mai.setStack(stack); mai.setInvocationContext(ActionContext.getContext()); Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml Sun Jul 9 17:57:05 2006 @@ -4,7 +4,7 @@ <include file="struts-default.xml"/> <package name="default" extends="struts-default"> - <action name="hello" class="com.opensymphony.xwork.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> @@ -16,7 +16,7 @@ class="org.apache.struts2.views.freemarker.FreemarkerResult"/> </result-types> - <action name="test" class="com.opensymphony.xwork.ActionSupport"> + <action name="test" class="com.opensymphony.xwork2.ActionSupport"> <result name="input">sitegraph/guess-input.ftl</result> </action> </package> @@ -27,7 +27,7 @@ class="org.apache.struts2.views.freemarker.FreemarkerResult"/> </result-types> - <action name="guess" class="com.opensymphony.xwork.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/trunk/core/src/test/resources/validators.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/validators.xml?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/validators.xml (original) +++ struts/struts2/trunk/core/src/test/resources/validators.xml Sun Jul 9 17:57:05 2006 @@ -1,15 +1,15 @@ <validators> - <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/> - <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/> - <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/> - <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/> - <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/> - <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/> - <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/> - <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/> - <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/> - <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/> - <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/> - <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/> - <validator name="regex" class="com.opensymphony.xwork.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/trunk/core/src/test/resources/xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/xwork.xml?rev=420385&r1=420384&r2=420385&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/xwork.xml (original) +++ struts/struts2/trunk/core/src/test/resources/xwork.xml Sun Jul 9 17:57:05 2006 @@ -4,7 +4,7 @@ <include file="struts-default.xml"/> <package name="default" extends="struts-default"> - <action name="hello" class="com.opensymphony.xwork.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> @@ -16,7 +16,7 @@ class="org.apache.struts2.views.freemarker.FreemarkerResult"/> </result-types> - <action name="test" class="com.opensymphony.xwork.ActionSupport"> + <action name="test" class="com.opensymphony.xwork2.ActionSupport"> <result name="input">sitegraph/guess-input.ftl</result> </action> </package> @@ -27,7 +27,7 @@ class="org.apache.struts2.views.freemarker.FreemarkerResult"/> </result-types> - <action name="guess" class="com.opensymphony.xwork.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>
