You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/03 17:30:10 UTC
svn commit: r391069 [8/9] - in /incubator/webwork2/src:
java/org/apache/struts/action2/ java/org/apache/struts/action2/components/
java/org/apache/struts/action2/components/table/
java/org/apache/struts/action2/components/table/renderer/ java/org/apach...
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
import org.w3c.dom.*;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
import com.opensymphony.xwork.ActionSupport;
import org.apache.commons.logging.Log;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java Mon Apr 3 08:28:51 2006
@@ -3,7 +3,7 @@
* All rights reserved.
*/
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
/**
* <code>RequestUtilsTest</code>
Copied: incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java Mon Apr 3 08:28:51 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
-import org.apache.struts.webwork.views.jsp.ui.User;
+import org.apache.struts.action2.views.jsp.ui.User;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
-import org.apache.struts.webwork.dispatcher.ServletDispatcherResult;
-import org.apache.struts.webwork.interceptor.TokenInterceptor;
-import org.apache.struts.webwork.interceptor.TokenSessionStoreInterceptor;
+import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
+import org.apache.struts.action2.interceptor.TokenInterceptor;
+import org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionChainResult;
import com.opensymphony.xwork.config.Configuration;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java (from r390927, incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java&p1=incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java&r1=390927&r2=391069&rev=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork;
+package org.apache.struts.action2;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/components/ComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/components/ComponentTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/components/ComponentTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/components/ComponentTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
import java.util.Iterator;
import java.util.Locale;
@@ -11,25 +11,25 @@
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.webwork.TestConfigurationProvider;
-import org.apache.struts.webwork.views.jsp.AbstractTagTest;
-import org.apache.struts.webwork.views.jsp.ActionTag;
-import org.apache.struts.webwork.views.jsp.BeanTag;
-import org.apache.struts.webwork.views.jsp.ElseIfTag;
-import org.apache.struts.webwork.views.jsp.ElseTag;
-import org.apache.struts.webwork.views.jsp.I18nTag;
-import org.apache.struts.webwork.views.jsp.IfTag;
-import org.apache.struts.webwork.views.jsp.IteratorTag;
-import org.apache.struts.webwork.views.jsp.PropertyTag;
-import org.apache.struts.webwork.views.jsp.PushTag;
-import org.apache.struts.webwork.views.jsp.SetTag;
-import org.apache.struts.webwork.views.jsp.TextTag;
-import org.apache.struts.webwork.views.jsp.URLTag;
-import org.apache.struts.webwork.views.jsp.iterator.AppendIteratorTag;
-import org.apache.struts.webwork.views.jsp.iterator.MergeIteratorTag;
-import org.apache.struts.webwork.views.jsp.ui.RichTextEditorTag;
-import org.apache.struts.webwork.views.jsp.ui.TextFieldTag;
-import org.apache.struts.webwork.views.jsp.ui.UpDownSelectTag;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.views.jsp.AbstractTagTest;
+import org.apache.struts.action2.views.jsp.ActionTag;
+import org.apache.struts.action2.views.jsp.BeanTag;
+import org.apache.struts.action2.views.jsp.ElseIfTag;
+import org.apache.struts.action2.views.jsp.ElseTag;
+import org.apache.struts.action2.views.jsp.I18nTag;
+import org.apache.struts.action2.views.jsp.IfTag;
+import org.apache.struts.action2.views.jsp.IteratorTag;
+import org.apache.struts.action2.views.jsp.PropertyTag;
+import org.apache.struts.action2.views.jsp.PushTag;
+import org.apache.struts.action2.views.jsp.SetTag;
+import org.apache.struts.action2.views.jsp.TextTag;
+import org.apache.struts.action2.views.jsp.URLTag;
+import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag;
+import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag;
+import org.apache.struts.action2.views.jsp.ui.RichTextEditorTag;
+import org.apache.struts.action2.views.jsp.ui.TextFieldTag;
+import org.apache.struts.action2.views.jsp.ui.UpDownSelectTag;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.util.LocalizedTextUtil;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/components/FormTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/components/FormTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/components/FormTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/components/FormTest.java Mon Apr 3 08:28:51 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
-import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
-import org.apache.struts.webwork.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
import com.opensymphony.xwork.validator.validators.RequiredFieldValidator;
import java.util.List;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/components/MockRichtexteditorConnector.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/components/MockRichtexteditorConnector.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/components/MockRichtexteditorConnector.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/components/MockRichtexteditorConnector.java Mon Apr 3 08:28:51 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.Folder;
-import org.apache.struts.webwork.components.AbstractRichtexteditorConnector.FoldersAndFiles;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
/**
*
Modified: incubator/webwork2/src/test/org/apache/struts/action2/components/PropertyTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/components/PropertyTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/components/PropertyTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/components/PropertyTest.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
-import org.apache.struts.webwork.components.Property;
-import org.apache.struts.webwork.util.StrutsTypeConverter;
+import org.apache.struts.action2.components.Property;
+import org.apache.struts.action2.util.StrutsTypeConverter;
import com.opensymphony.xwork.util.OgnlValueStack;
import com.opensymphony.xwork.util.XWorkConverter;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/components/UIComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/components/UIComponentTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/components/UIComponentTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/components/UIComponentTest.java Mon Apr 3 08:28:51 2006
@@ -2,30 +2,30 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.components;
+package org.apache.struts.action2.components;
-import org.apache.struts.webwork.TestConfigurationProvider;
-import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
-import org.apache.struts.webwork.views.jsp.ui.ActionErrorTag;
-import org.apache.struts.webwork.views.jsp.ui.ActionMessageTag;
-import org.apache.struts.webwork.views.jsp.ui.AnchorTag;
-import org.apache.struts.webwork.views.jsp.ui.CheckboxTag;
-import org.apache.struts.webwork.views.jsp.ui.ComboBoxTag;
-import org.apache.struts.webwork.views.jsp.ui.DivTag;
-import org.apache.struts.webwork.views.jsp.ui.DoubleSelectTag;
-import org.apache.struts.webwork.views.jsp.ui.FieldErrorTag;
-import org.apache.struts.webwork.views.jsp.ui.FileTag;
-import org.apache.struts.webwork.views.jsp.ui.FormTag;
-import org.apache.struts.webwork.views.jsp.ui.HiddenTag;
-import org.apache.struts.webwork.views.jsp.ui.LabelTag;
-import org.apache.struts.webwork.views.jsp.ui.OptionTransferSelectTag;
-import org.apache.struts.webwork.views.jsp.ui.PasswordTag;
-import org.apache.struts.webwork.views.jsp.ui.RadioTag;
-import org.apache.struts.webwork.views.jsp.ui.SelectTag;
-import org.apache.struts.webwork.views.jsp.ui.SubmitTag;
-import org.apache.struts.webwork.views.jsp.ui.TextFieldTag;
-import org.apache.struts.webwork.views.jsp.ui.TextareaTag;
-import org.apache.struts.webwork.views.jsp.ui.TokenTag;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ui.ActionErrorTag;
+import org.apache.struts.action2.views.jsp.ui.ActionMessageTag;
+import org.apache.struts.action2.views.jsp.ui.AnchorTag;
+import org.apache.struts.action2.views.jsp.ui.CheckboxTag;
+import org.apache.struts.action2.views.jsp.ui.ComboBoxTag;
+import org.apache.struts.action2.views.jsp.ui.DivTag;
+import org.apache.struts.action2.views.jsp.ui.DoubleSelectTag;
+import org.apache.struts.action2.views.jsp.ui.FieldErrorTag;
+import org.apache.struts.action2.views.jsp.ui.FileTag;
+import org.apache.struts.action2.views.jsp.ui.FormTag;
+import org.apache.struts.action2.views.jsp.ui.HiddenTag;
+import org.apache.struts.action2.views.jsp.ui.LabelTag;
+import org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag;
+import org.apache.struts.action2.views.jsp.ui.PasswordTag;
+import org.apache.struts.action2.views.jsp.ui.RadioTag;
+import org.apache.struts.action2.views.jsp.ui.SelectTag;
+import org.apache.struts.action2.views.jsp.ui.SubmitTag;
+import org.apache.struts.action2.views.jsp.ui.TextFieldTag;
+import org.apache.struts.action2.views.jsp.ui.TextareaTag;
+import org.apache.struts.action2.views.jsp.ui.TokenTag;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java Mon Apr 3 08:28:51 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.config;
+package org.apache.struts.action2.config;
-import org.apache.struts.webwork.StrutsTestCase;
-import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.StrutsConstants;
import com.opensymphony.xwork.util.LocalizedTextUtil;
import java.util.Iterator;
@@ -23,7 +23,7 @@
assertEquals("12345", Configuration.getString(StrutsConstants.STRUTS_MULTIPART_MAXSIZE));
assertEquals("\temp", Configuration.getString(StrutsConstants.STRUTS_MULTIPART_SAVEDIR));
- assertEquals("test,org/apache/struts/webwork/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES));
+ assertEquals("test,org/apache/struts/action2/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES));
assertEquals("testvalue", Configuration.getString("testkey"));
assertEquals("othertestvalue", Configuration.getString("othertestkey"));
@@ -44,7 +44,7 @@
Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties
LocalizedTextUtil.clearDefaultResourceBundles();
- LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/webwork/struts-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/struts-messages");
assertEquals("The form has already been processed or no token was supplied, please try again.", LocalizedTextUtil.findDefaultText("struts.messages.invalid.token", Locale.getDefault()));
Configuration.reset();
Modified: incubator/webwork2/src/test/org/apache/struts/action2/config/TestConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/config/TestConfiguration.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/config/TestConfiguration.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/config/TestConfiguration.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.config;
+package org.apache.struts.action2.config;
import java.util.ArrayList;
import java.util.Iterator;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java Mon Apr 3 08:28:51 2006
@@ -6,7 +6,7 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
@@ -14,9 +14,9 @@
import com.mockobjects.servlet.MockHttpSession;
import com.mockobjects.servlet.MockServletConfig;
import com.mockobjects.servlet.MockServletOutputStream;
-import org.apache.struts.webwork.StrutsTestCase;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletResponse;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ChartResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ChartResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ChartResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ChartResultTest.java Mon Apr 3 08:28:51 2006
@@ -8,10 +8,10 @@
* To change the template for this generated file go to Window - Preferences -
* Java - Code Generation - Code and Comments
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java Mon Apr 3 08:28:51 2006
@@ -6,14 +6,14 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.servlet.MockHttpServletRequest;
-import org.apache.struts.webwork.StrutsTestCase;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
-import org.apache.struts.webwork.dispatcher.mapper.DefaultActionMapper;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper;
import java.util.HashMap;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import java.util.Locale;
@@ -29,7 +29,7 @@
LocalizedTextUtil.findDefaultText("xwork.error.action.execution", Locale.US),
"Error during Action invocation");
- // some i18n messages from webwork-messages.properties
+ // some i18n messages from struts-messages.properties
assertEquals(
LocalizedTextUtil.findDefaultText("struts.messages.error.uploading", Locale.US,
new Object[] { "some error messages" }),
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import java.util.HashMap;
import java.util.Map;
@@ -12,11 +12,11 @@
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockServletContext;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.util.ObjectFactoryDestroyable;
-import org.apache.struts.webwork.util.ObjectFactoryInitializable;
-import org.apache.struts.webwork.util.ObjectFactoryLifecycle;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.ObjectFactoryDestroyable;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.util.ObjectFactoryLifecycle;
import com.opensymphony.xwork.ObjectFactory;
import junit.framework.TestCase;
@@ -76,7 +76,7 @@
DispatcherUtils.setInstance(null);
Map configMap = new HashMap();
- configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.webwork.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
+ configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
Configuration.setConfiguration(new InnerConfiguration(configMap));
@@ -96,7 +96,7 @@
DispatcherUtils.setInstance(null);
Map configMap = new HashMap();
- configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.webwork.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
+ configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
Configuration.setConfiguration(new InnerConfiguration(configMap));
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.XWorkTestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/NullActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/NullActionMapper.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/NullActionMapper.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/NullActionMapper.java Mon Apr 3 08:28:51 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapper;
-import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
/**
* ActionMapper for testing FilterDispatcher (used in FilterDispaatcherTest)
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,17 +2,17 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts.webwork.StrutsStatics;
-import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletResponse;
-import org.apache.struts.webwork.views.jsp.StrutsMockServletContext;
+import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts.action2.views.jsp.StrutsMockServletContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.mock.MockActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -71,7 +71,7 @@
response.setExpectedHeader("Content-Disposition", "inline");
InputStream jspResourceInputStream =
ClassLoaderUtil.getResourceAsStream(
- "org/apache/struts/webwork/dispatcher/someJspFile.jsp",
+ "org/apache/struts/action2/dispatcher/someJspFile.jsp",
PlainTextResultTest.class);
@@ -81,7 +81,7 @@
String r = AbstractUITagTest.normalize(stringWriter.getBuffer().toString(), true);
String e = AbstractUITagTest.normalize(
- readAsString("org/apache/struts/webwork/dispatcher/someJspFile.jsp"), true);
+ readAsString("org/apache/struts/action2/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
finally {
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java Mon Apr 3 08:28:51 2006
@@ -6,9 +6,9 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
-import org.apache.struts.webwork.TestAction;
+import org.apache.struts.action2.TestAction;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.Interceptor;
import junit.framework.Assert;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsStatics;
-import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import ognl.Ognl;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java Mon Apr 3 08:28:51 2006
@@ -6,7 +6,7 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import java.util.HashMap;
import java.util.Map;
@@ -17,7 +17,7 @@
*/
public class ServletDispatcherTest extends AbstractServletDispatcherTestCase {
public String getConfigFilename() {
- return "org/apache/struts/webwork/dispatcher/ServletDispatcherTest-xwork.xml";
+ return "org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml";
}
public ServletDispatcher getServletDispatcher() {
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsStatics;
-import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.mock.MockActionInvocation;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/SessionMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/SessionMapTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/SessionMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/SessionMapTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.constraint.Constraint;
import com.mockobjects.constraint.IsAnything;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/StreamResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/StreamResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/StreamResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/StreamResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.mock.MockActionInvocation;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork.ActionContext;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
import java.util.HashMap;
import java.util.Map;
-import org.apache.struts.webwork.dispatcher.ServletRedirectResult;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.action2.dispatcher.ServletRedirectResult;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
import com.opensymphony.xwork.Result;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
import junit.framework.TestCase;
@@ -10,7 +10,7 @@
import java.util.Collections;
import java.util.HashMap;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
/**
* Unit test for {@link RestfulActionMapper}.
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import javax.servlet.http.HttpServletRequest;
@@ -10,8 +10,8 @@
import org.jmock.core.constraint.IsEqual;
import org.jmock.core.matcher.InvokeOnceMatcher;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.mock.MockActionInvocation;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.Action;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -3,12 +3,12 @@
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsTestCase;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpSession;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpSession;
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.mock.MockResult;
import com.opensymphony.xwork.config.Configuration;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.StrutsTestCase;
-import org.apache.struts.webwork.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.mock.MockActionInvocation;
import org.springframework.mock.web.MockHttpServletRequest;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
-import org.apache.struts.webwork.StrutsStatics;
-import org.apache.struts.webwork.StrutsTestCase;
-import org.apache.struts.webwork.util.ServletContextAware;
+import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.util.ServletContextAware;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.mock.MockActionInvocation;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
@@ -11,8 +11,7 @@
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.webwork.StrutsTestCase;
-import junit.framework.TestCase;
+import org.apache.struts.action2.StrutsTestCase;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
-import org.apache.struts.webwork.ServletActionContext;
-import org.apache.struts.webwork.TestConfigurationProvider;
-import org.apache.struts.webwork.util.TokenHelper;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts.webwork.views.jsp.StrutsMockHttpSession;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpSession;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
import com.opensymphony.xwork.ActionProxy;
import com.opensymphony.xwork.Action;
-import org.apache.struts.webwork.TestConfigurationProvider;
+import org.apache.struts.action2.TestConfigurationProvider;
/**
* Unit test for {@link TokenSessionStoreInterceptor}.
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletApplicationMapTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletApplicationMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletApplicationMapTest.java Mon Apr 3 08:28:51 2006
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.struts.webwork.portlet;
+package org.apache.struts.action2.portlet;
import java.util.ArrayList;
import java.util.Arrays;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletRequestMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletRequestMapTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletRequestMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletRequestMapTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet;
+package org.apache.struts.action2.portlet;
import java.util.ArrayList;
import java.util.Arrays;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletSessionMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletSessionMapTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletSessionMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/PortletSessionMapTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet;
+package org.apache.struts.action2.portlet;
import java.util.Arrays;
import java.util.Enumeration;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PortletActionContextTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PortletActionContextTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PortletActionContextTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
import java.util.HashMap;
import java.util.Map;
@@ -18,7 +18,7 @@
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
-import org.apache.struts.webwork.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PreparatorServletTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PreparatorServletTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/PreparatorServletTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -11,7 +11,7 @@
import org.easymock.MockControl;
-import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java Mon Apr 3 08:28:51 2006
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.struts.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet.dispatcher;
+package org.apache.struts.action2.portlet.dispatcher;
import java.util.Collections;
import java.util.HashMap;
@@ -29,8 +29,8 @@
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
-import org.apache.struts.webwork.portlet.PortletActionConstants;
-import org.apache.struts.webwork.portlet.context.ServletContextHolderListener;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.ServletContextHolderListener;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/result/PortletResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/result/PortletResultTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/result/PortletResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/result/PortletResultTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet.result;
+package org.apache.struts.action2.portlet.result;
import java.util.HashMap;
import java.util.Map;
@@ -22,7 +22,7 @@
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
-import org.apache.struts.webwork.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java Mon Apr 3 08:28:51 2006
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.struts.webwork.portlet.util;
+package org.apache.struts.action2.portlet.util;
import java.util.HashMap;
import java.util.Map;
@@ -19,7 +19,7 @@
import org.easymock.MockControl;
-import org.apache.struts.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionContext;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.portlet.util;
+package org.apache.struts.action2.portlet.util;
import java.util.ArrayList;
import java.util.List;
@@ -15,9 +15,9 @@
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockRequestDispatcher;
-import org.apache.struts.webwork.TestAction;
-import org.apache.struts.webwork.util.ListEntry;
-import org.apache.struts.webwork.util.StrutsUtil;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.util.ListEntry;
+import org.apache.struts.action2.util.StrutsUtil;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
@@ -33,10 +33,10 @@
protected OgnlValueStack stack = null;
protected InternalMockHttpServletRequest request = null;
protected MockHttpServletResponse response = null;
- protected StrutsUtil webWorkUtil = null;
+ protected StrutsUtil strutsUtil = null;
public void testBeanMethod() throws Exception {
- Object o = webWorkUtil.bean("org.apache.struts.webwork.TestAction");
+ Object o = strutsUtil.bean("org.apache.struts.action2.TestAction");
assertNotNull(o);
assertTrue(o instanceof TestAction);
}
@@ -50,10 +50,10 @@
return bool;
}
});
- assertTrue(webWorkUtil.isTrue("myString == 'myString'"));
- assertFalse(webWorkUtil.isTrue("myString == 'myOtherString'"));
- assertTrue(webWorkUtil.isTrue("getMyBoolean(true)"));
- assertFalse(webWorkUtil.isTrue("getMyBoolean(false)"));
+ assertTrue(strutsUtil.isTrue("myString == 'myString'"));
+ assertFalse(strutsUtil.isTrue("myString == 'myOtherString'"));
+ assertTrue(strutsUtil.isTrue("getMyBoolean(true)"));
+ assertFalse(strutsUtil.isTrue("getMyBoolean(false)"));
}
public void testFindStringMethod() throws Exception {
@@ -66,13 +66,13 @@
}
});
- assertEquals(webWorkUtil.findString("myString"), "myString");
- assertNull(webWorkUtil.findString("myOtherString"));
- assertEquals(webWorkUtil.findString("getMyBoolean(true)"), "true");
+ assertEquals(strutsUtil.findString("myString"), "myString");
+ assertNull(strutsUtil.findString("myOtherString"));
+ assertEquals(strutsUtil.findString("getMyBoolean(true)"), "true");
}
public void testIncludeMethod() throws Exception {
- webWorkUtil.include("/some/includedJspFile.jsp");
+ strutsUtil.include("/some/includedJspFile.jsp");
// with include, this must have been created and should not be null
assertNotNull(request.getDispatcher());
@@ -83,19 +83,19 @@
public void testTextToHtmlMethod() throws Exception {
assertEquals(
- webWorkUtil.textToHtml("<html><head><title>some title</title><body>some content</body></html>"),
+ strutsUtil.textToHtml("<html><head><title>some title</title><body>some content</body></html>"),
"<html><head><title>some title</title><body>some content</body></html>");
}
public void testUrlEncodeMethod() throws Exception {
assertEquals(
- webWorkUtil.urlEncode("http://www.opensymphony.com/webwork/index.jsp?param1=value1"),
- "http%3A%2F%2Fwww.opensymphony.com%2Fwebwork%2Findex.jsp%3Fparam1%3Dvalue1");
+ strutsUtil.urlEncode("http://www.opensymphony.com/action2/index.jsp?param1=value1"),
+ "http%3A%2F%2Fwww.opensymphony.com%2Faction2%2Findex.jsp%3Fparam1%3Dvalue1");
}
public void testBuildUrlMethod() throws Exception {
request.setContextPath("/myContextPath");
- assertEquals(webWorkUtil.buildUrl("/someUrl?param1=value1"), "/myContextPath/someUrl?param1=value1");
+ assertEquals(strutsUtil.buildUrl("/someUrl?param1=value1"), "/myContextPath/someUrl?param1=value1");
}
@@ -108,8 +108,8 @@
return bool;
}
});
- Object obj1 = webWorkUtil.findValue("myString", "java.lang.String");
- Object obj2 = webWorkUtil.findValue("getMyBoolean(true)", "java.lang.Boolean");
+ Object obj1 = strutsUtil.findValue("myString", "java.lang.String");
+ Object obj2 = strutsUtil.findValue("getMyBoolean(true)", "java.lang.Boolean");
assertNotNull(obj1);
assertNotNull(obj2);
@@ -124,14 +124,14 @@
public void testGetTextMethod() throws Exception {
// this should be in xwork-messages.properties (included by default
// by LocalizedTextUtil
- assertNotNull(webWorkUtil.getText("xwork.error.action.execution"));
- assertEquals(webWorkUtil.getText("xwork.error.action.execution"), "Error during Action invocation");
+ assertNotNull(strutsUtil.getText("xwork.error.action.execution"));
+ assertEquals(strutsUtil.getText("xwork.error.action.execution"), "Error during Action invocation");
}
public void testGetContextMethod() throws Exception {
request.setContextPath("/myContext");
- assertEquals(webWorkUtil.getContext(), "/myContext");
+ assertEquals(strutsUtil.getContext(), "/myContext");
}
@@ -145,7 +145,7 @@
stack.getContext().put("mySelectedList", selectedList);
stack.getContext().put("myList", list);
- List listMade = webWorkUtil.makeSelectList("#mySelectedList", "#myList", null, null);
+ List listMade = strutsUtil.makeSelectList("#mySelectedList", "#myList", null, null);
assertEquals(listMade.size(), 3);
assertEquals(((ListEntry)listMade.get(0)).getKey(), "Lorry");
@@ -162,24 +162,24 @@
public void testHtmlEncode() throws Exception {
assertEquals(
- webWorkUtil.htmlEncode("<html><head><title>some title</title><body>some content</body></html>"),
+ strutsUtil.htmlEncode("<html><head><title>some title</title><body>some content</body></html>"),
"<html><head><title>some title</title><body>some content</body></html>");
}
public void testToInt() throws Exception {
- assertEquals(webWorkUtil.toInt(11l), 11);
+ assertEquals(strutsUtil.toInt(11l), 11);
}
public void testToLong() throws Exception {
- assertEquals(webWorkUtil.toLong(11), 11l);
+ assertEquals(strutsUtil.toLong(11), 11l);
}
public void testToString() throws Exception {
- assertEquals(webWorkUtil.toString(1), "1");
- assertEquals(webWorkUtil.toString(11l), "11");
+ assertEquals(strutsUtil.toString(1), "1");
+ assertEquals(strutsUtil.toString(11l), "11");
}
@@ -190,14 +190,14 @@
stack = new OgnlValueStack();
request = new InternalMockHttpServletRequest();
response = new MockHttpServletResponse();
- webWorkUtil = new StrutsUtil(stack, request, response);
+ strutsUtil = new StrutsUtil(stack, request, response);
}
protected void tearDown() throws Exception {
stack = null;
request = null;
response = null;
- webWorkUtil = null;
+ strutsUtil = null;
super.tearDown();
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
import com.opensymphony.util.FileUtils;
-import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.action2.StrutsTestCase;
import java.io.File;
import java.io.StringWriter;
@@ -13,13 +13,13 @@
*/
public class SiteGraphTest extends StrutsTestCase {
public void testWebFlow() {
- String dir = "src/test/org/apache/struts/webwork/sitegraph";
+ String dir = "src/test/org/apache/struts/action2/sitegraph";
SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
StringWriter writer = new StringWriter();
siteGraph.setWriter(writer);
siteGraph.prepare();
- String out = "src/test/org/apache/struts/webwork/sitegraph/out.txt";
+ String out = "src/test/org/apache/struts/action2/sitegraph/out.txt";
assertEquals(FileUtils.readFile(new File(out)), writer.toString());
}
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java Mon Apr 3 08:28:51 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.spring;
+package org.apache.struts.action2.spring;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
import junit.framework.TestCase;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.mock.web.MockServletContext;
@@ -42,7 +42,7 @@
ServletContext msc = (ServletContext) new MockServletContext();
msc.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac);
ac.setServletContext(msc);
- ac.setConfigLocations(new String[] {"/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
+ ac.setConfigLocations(new String[] {"/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
ac.refresh();
fac.init(msc);
Modified: incubator/webwork2/src/test/org/apache/struts/action2/util/CounterTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/CounterTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/CounterTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/CounterTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java Mon Apr 3 08:28:51 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
@@ -22,8 +22,8 @@
*/
public class InvocationSessionStoreTest extends StrutsTestCase {
- private static final String INVOCATION_KEY = "org.apache.struts.webwork.util.InvocationSessionStoreTest.invocation";
- private static final String TOKEN_VALUE = "org.apache.struts.webwork.util.InvocationSessionStoreTest.token";
+ private static final String INVOCATION_KEY = "org.apache.struts.action2.util.InvocationSessionStoreTest.invocation";
+ private static final String TOKEN_VALUE = "org.apache.struts.action2.util.InvocationSessionStoreTest.token";
private ActionInvocation invocation;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/util/PrefixTrieTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/PrefixTrieTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/PrefixTrieTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/PrefixTrieTest.java Mon Apr 3 08:28:51 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import java.util.Date;
import java.util.HashMap;
@@ -20,15 +20,15 @@
public class StrutsTypeConverterTest extends TestCase {
/**
- * Typically form webwork -> html
+ * Typically form Struts -> html
*
* @throws Exception
*/
public void testConvertToString() throws Exception {
- InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
- webWorkTypeConverter.convertValue(new HashMap(), "", String.class);
- assertTrue(webWorkTypeConverter.isConvertToString);
- assertEquals(webWorkTypeConverter.objToBeConverted, "");
+ InternalStrutsTypeConverter strutsTypeConverter = new InternalStrutsTypeConverter();
+ strutsTypeConverter.convertValue(new HashMap(), "", String.class);
+ assertTrue(strutsTypeConverter.isConvertToString);
+ assertEquals(strutsTypeConverter.objToBeConverted, "");
}
/**
@@ -37,11 +37,11 @@
* @throws Exception
*/
public void testConvertFromString() throws Exception {
- InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
- webWorkTypeConverter.convertValue(new HashMap(), "12/12/1997", Date.class);
- assertTrue(webWorkTypeConverter.isConvertFromString);
- assertTrue(webWorkTypeConverter.objToBeConverted instanceof String[]);
- assertEquals(((String[])webWorkTypeConverter.objToBeConverted).length, 1);
+ InternalStrutsTypeConverter strutsTypeConverter = new InternalStrutsTypeConverter();
+ strutsTypeConverter.convertValue(new HashMap(), "12/12/1997", Date.class);
+ assertTrue(strutsTypeConverter.isConvertFromString);
+ assertTrue(strutsTypeConverter.objToBeConverted instanceof String[]);
+ assertEquals(((String[])strutsTypeConverter.objToBeConverted).length, 1);
}
/**
@@ -51,18 +51,18 @@
* @throws Exception
*/
public void testConvertFromStringInArrayForm() throws Exception {
- InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
- webWorkTypeConverter.convertValue(new HashMap(), new String[] { "12/12/1997", "1/1/1977" }, Date.class);
- assertTrue(webWorkTypeConverter.isConvertFromString);
- assertTrue(webWorkTypeConverter.objToBeConverted instanceof String[]);
- assertEquals(((String[])webWorkTypeConverter.objToBeConverted).length, 2);
+ InternalStrutsTypeConverter strutsTypeConverter = new InternalStrutsTypeConverter();
+ strutsTypeConverter.convertValue(new HashMap(), new String[] { "12/12/1997", "1/1/1977" }, Date.class);
+ assertTrue(strutsTypeConverter.isConvertFromString);
+ assertTrue(strutsTypeConverter.objToBeConverted instanceof String[]);
+ assertEquals(((String[])strutsTypeConverter.objToBeConverted).length, 2);
}
public void testFallbackConversion() throws Exception {
- InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
- webWorkTypeConverter.convertValue(new HashMap(), new Object(), Date.class);
- assertTrue(webWorkTypeConverter.fallbackConversion);
+ InternalStrutsTypeConverter strutsTypeConverter = new InternalStrutsTypeConverter();
+ strutsTypeConverter.convertValue(new HashMap(), new Object(), Date.class);
+ assertTrue(strutsTypeConverter.fallbackConversion);
}
// === internal class for testing
Modified: incubator/webwork2/src/test/org/apache/struts/action2/util/TokenHelperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/TokenHelperTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/TokenHelperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/TokenHelperTest.java Mon Apr 3 08:28:51 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.util;
+package org.apache.struts.action2.util;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/TemplateEngineManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/TemplateEngineManagerTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/TemplateEngineManagerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/TemplateEngineManagerTest.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.webwork.views;
+package org.apache.struts.action2.views;
-import org.apache.struts.webwork.components.template.*;
-import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.action2.components.template.*;
+import org.apache.struts.action2.config.Configuration;
import junit.framework.TestCase;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java Mon Apr 3 08:28:51 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
-import org.apache.struts.webwork.StrutsConstants;
-import org.apache.struts.webwork.config.Configuration;
-import org.apache.struts.webwork.views.jsp.StrutsMockServletContext;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.jsp.StrutsMockServletContext;
import junit.framework.TestCase;
@@ -18,7 +18,7 @@
*/
public class FreemarkerManagerTest extends TestCase {
- public void testIfWebworkEncodingIsSetProperty() throws Exception {
+ public void testIfStrutsEncodingIsSetProperty() throws Exception {
Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
StrutsMockServletContext servletContext = new StrutsMockServletContext();
servletContext.setAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY, null);
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java Mon Apr 3 08:28:51 2006
@@ -6,10 +6,10 @@
* Created on 1/10/2003
*
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
-import org.apache.struts.webwork.util.ListEntry;
-import org.apache.struts.webwork.util.StrutsUtil;
+import org.apache.struts.action2.util.ListEntry;
+import org.apache.struts.action2.util.StrutsUtil;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
import freemarker.ext.beans.CollectionModel;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/TestAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/TestAction.java?rev=391069&r1=390927&r2=391069&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/TestAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/TestAction.java Mon Apr 3 08:28:51 2006
@@ -1,7 +1,7 @@
/* * Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
import com.opensymphony.xwork.ActionSupport;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org