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/02 19:07:30 UTC
svn commit: r390860 [1/3] - in
/incubator/webwork2/src/test/org/apache/struts: action2/
action2/components/ action2/config/ action2/dispatcher/
action2/interceptor/ action2/portlet/ action2/sitegraph/ action2/spring/
action2/util/ action2/views/ webwor...
Author: tmjee
Date: Sun Apr 2 10:07:23 2006
New Revision: 390860
URL: http://svn.apache.org/viewcvs?rev=390860&view=rev
Log:
moved org/apache/struts/action2 to org/apache/struts/webwork
Added:
incubator/webwork2/src/test/org/apache/struts/webwork/
incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java
incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/TestAction-validation.xml
- copied unchanged from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestAction-validation.xml
incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java
incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.properties
- copied unchanged from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestAction.properties
incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java
incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java
incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java
- copied, changed from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java
incubator/webwork2/src/test/org/apache/struts/webwork/components/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/components/
incubator/webwork2/src/test/org/apache/struts/webwork/config/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/config/
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/interceptor/
incubator/webwork2/src/test/org/apache/struts/webwork/othertest.properties
- copied unchanged from r390850, incubator/webwork2/src/test/org/apache/struts/action2/othertest.properties
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/portlet/
incubator/webwork2/src/test/org/apache/struts/webwork/sitegraph/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/
incubator/webwork2/src/test/org/apache/struts/webwork/spring/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/spring/
incubator/webwork2/src/test/org/apache/struts/webwork/util/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/util/
incubator/webwork2/src/test/org/apache/struts/webwork/views/
- copied from r390850, incubator/webwork2/src/test/org/apache/struts/action2/views/
Removed:
incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java
incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java
incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java
incubator/webwork2/src/test/org/apache/struts/action2/TestAction-validation.xml
incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java
incubator/webwork2/src/test/org/apache/struts/action2/TestAction.properties
incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java
incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java
incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java
incubator/webwork2/src/test/org/apache/struts/action2/components/
incubator/webwork2/src/test/org/apache/struts/action2/config/
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/
incubator/webwork2/src/test/org/apache/struts/action2/othertest.properties
incubator/webwork2/src/test/org/apache/struts/action2/portlet/
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/
incubator/webwork2/src/test/org/apache/struts/action2/spring/
incubator/webwork2/src/test/org/apache/struts/action2/util/
incubator/webwork2/src/test/org/apache/struts/action2/views/
Modified:
incubator/webwork2/src/test/org/apache/struts/webwork/components/AbstractRichtexteditorConnectorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/components/ComponentTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/components/FormTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/components/MockRichtexteditorConnector.java
incubator/webwork2/src/test/org/apache/struts/webwork/components/PropertyTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/components/UIComponentTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/config/ConfigurationTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/config/TestConfiguration.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/AbstractServletDispatcherTestCase.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ChartResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DefautActionMapperTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DispatcherUtilsTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/FilterDispatcherTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/HttpHeaderResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/NullActionMapper.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/PlainTextResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletRedirectResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/SessionMapTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/StreamResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/VelocityResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapperTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapperTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/CreateSessionInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitDelayAction.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/FileUploadInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ServletConfigInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletApplicationMapTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletRequestMapTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletSessionMapTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PortletActionContextTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PreparatorServletTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/ServletContextHolderListenerTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/result/PortletResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/PortletUrlHelperTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/StrutsUtilTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/sitegraph/SiteGraphTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/util/CounterTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/util/InvocationSessionStoreTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/util/PrefixTrieTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/util/StrutsTypeConverterTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/util/TokenHelperTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/TemplateEngineManagerTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerManagerTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestAction.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestBean.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractUITagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ActionTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AnchorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AppendIteratorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/BeanTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseIfTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IfTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IncludeTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorGeneratorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/MergeIteratorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PortletUrlTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PropertyTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PushTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SetTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SortIteratorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockBodyContent.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletRequest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletResponse.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpSession.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockJspWriter.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockPageContext.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockServletContext.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SubsetIteratorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/TextTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/URLTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionErrorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionMessageTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AnchorTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxListTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComboBoxTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComponentTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DatePickerTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DateTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DebugTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DivTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DoubleSelectTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FieldErrorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FileTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FormTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HeadTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HiddenTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/JspTemplateTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/LabelTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/MockTag.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/OptionTransferSelectTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/PasswordTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RadioTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ResetTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichTextEditorTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SelectTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/StrutsBodyContent.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitAjaxTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TestAction1.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextareaTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextfieldTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TokenTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TooltipTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/UpDownSelectTagTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/User.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/util/ContextUtilTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/util/ResourceUtilTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/util/TextUtilTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/util/UrlHelperTest.java
incubator/webwork2/src/test/org/apache/struts/webwork/views/xslt/XSLTResultTest.java
Copied: incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/ExecutionCountTestAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/ExecutionCountTestAction.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
import com.opensymphony.xwork.ActionSupport;
import org.apache.commons.logging.Log;
@@ -17,7 +17,10 @@
*/
public class ExecutionCountTestAction extends ActionSupport {
- private static final Log LOG = LogFactory.getLog(ExecutionCountTestAction.class);
+ private static final long serialVersionUID = -2954211394678430609L;
+
+
+ private static final Log LOG = LogFactory.getLog(ExecutionCountTestAction.class);
private int executionCount = 0;
Copied: incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/RequestUtilsTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/RequestUtilsTest.java Sun Apr 2 10:07:23 2006
@@ -3,7 +3,7 @@
* All rights reserved.
*/
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
/**
* <code>RequestUtilsTest</code>
Copied: incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/ServletActionContextTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.mockobjects.servlet.MockHttpServletResponse;
Copied: incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/TestAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/TestAction.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
-import org.apache.struts.action2.views.jsp.ui.User;
+import org.apache.struts.webwork.views.jsp.ui.User;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
@@ -19,7 +19,9 @@
*/
public class TestAction extends ActionSupport {
- private Collection collection;
+ private static final long serialVersionUID = -8891365561914451494L;
+
+ private Collection collection;
private Collection collection2;
private Map map;
private String foo;
Copied: incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/TestActionTagResult.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/TestActionTagResult.java Sun Apr 2 10:07:23 2006
@@ -1,10 +1,12 @@
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
public class TestActionTagResult implements Result {
+ private static final long serialVersionUID = 5245516954875657626L;
+
private boolean _isExecuted;
public void execute(ActionInvocation invocation) throws Exception {
Copied: incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/TestConfigurationProvider.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/TestConfigurationProvider.java Sun Apr 2 10:07:23 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
-import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
-import org.apache.struts.action2.interceptor.TokenInterceptor;
-import org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor;
+import org.apache.struts.webwork.dispatcher.ServletDispatcherResult;
+import org.apache.struts.webwork.interceptor.TokenInterceptor;
+import org.apache.struts.webwork.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/webwork/TestResult.java (from r390850, incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java?p2=incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java&r1=390850&r2=390860&rev=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/TestResult.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/TestResult.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2;
+package org.apache.struts.webwork;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
@@ -24,7 +24,10 @@
*/
public class TestResult implements Result {
- private static final Log LOG = LogFactory.getLog(TestResult.class);
+ private static final long serialVersionUID = -4429258122011663164L;
+
+
+ private static final Log LOG = LogFactory.getLog(TestResult.class);
private List expectedValues = new ArrayList();
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/components/AbstractRichtexteditorConnectorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/components/AbstractRichtexteditorConnectorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/components/AbstractRichtexteditorConnectorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/components/AbstractRichtexteditorConnectorTest.java Sun Apr 2 10:07:23 2006
@@ -2,11 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/components/ComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/components/ComponentTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/components/ComponentTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/components/ComponentTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
import java.util.Iterator;
import java.util.Locale;
@@ -11,25 +11,25 @@
import javax.servlet.jsp.tagext.TagSupport;
-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 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 com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.util.LocalizedTextUtil;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/components/FormTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/components/FormTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/components/FormTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/components/FormTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
import com.opensymphony.xwork.validator.validators.RequiredFieldValidator;
import java.util.List;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/components/MockRichtexteditorConnector.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/components/MockRichtexteditorConnector.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/components/MockRichtexteditorConnector.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/components/MockRichtexteditorConnector.java Sun Apr 2 10:07:23 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-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;
+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;
/**
*
@@ -16,6 +16,8 @@
*/
public class MockRichtexteditorConnector extends AbstractRichtexteditorConnector {
+ private static final long serialVersionUID = -1711041371619240994L;
+
public boolean isCalculateServerPathCalled = false;
public boolean isGetFoldersCalled = false;
public boolean isGetFoldersAndFilesCalled = false;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/components/PropertyTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/components/PropertyTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/components/PropertyTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/components/PropertyTest.java Sun Apr 2 10:07:23 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import org.apache.struts.action2.components.Property;
-import org.apache.struts.action2.util.StrutsTypeConverter;
+import org.apache.struts.webwork.components.Property;
+import org.apache.struts.webwork.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/webwork/components/UIComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/components/UIComponentTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/components/UIComponentTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/components/UIComponentTest.java Sun Apr 2 10:07:23 2006
@@ -2,35 +2,30 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.components;
+package org.apache.struts.webwork.components;
-import java.util.Iterator;
-import java.util.Stack;
-
-import javax.servlet.jsp.tagext.TagSupport;
-
-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 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 com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/config/ConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/config/ConfigurationTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/config/ConfigurationTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/config/ConfigurationTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
-import org.apache.struts.action2.StrutsTestCase;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.webwork.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/action2/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES));
+ assertEquals("test,org/apache/struts/webwork/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/action2/struts-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/webwork/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();
@@ -65,7 +65,6 @@
Iterator keyNames = Configuration.list();
while (keyNames.hasNext()) {
- String key = (String) keyNames.next();
count++;
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/config/TestConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/config/TestConfiguration.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/config/TestConfiguration.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/config/TestConfiguration.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.config;
+package org.apache.struts.webwork.config;
import java.util.ArrayList;
import java.util.Iterator;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/AbstractServletDispatcherTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/AbstractServletDispatcherTestCase.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/AbstractServletDispatcherTestCase.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/AbstractServletDispatcherTestCase.java Sun Apr 2 10:07:23 2006
@@ -6,7 +6,7 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.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.action2.StrutsTestCase;
-import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts.action2.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletResponse;
import com.opensymphony.xwork.config.ConfigurationManager;
import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ChartResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ChartResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ChartResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ChartResultTest.java Sun Apr 2 10:07:23 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.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DefautActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DefautActionMapperTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DefautActionMapperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DefautActionMapperTest.java Sun Apr 2 10:07:23 2006
@@ -6,14 +6,14 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.servlet.MockHttpServletRequest;
-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 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 java.util.HashMap;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DispatcherUtilsTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DispatcherUtilsTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DispatcherUtilsTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/DispatcherUtilsTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import java.util.Locale;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/FilterDispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/FilterDispatcherTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/FilterDispatcherTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/FilterDispatcherTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.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.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 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 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.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
+ configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.webwork.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.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
+ configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.webwork.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
Configuration.setConfiguration(new InnerConfiguration(configMap));
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/HttpHeaderResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/HttpHeaderResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/HttpHeaderResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/HttpHeaderResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.XWorkTestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/NullActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/NullActionMapper.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/NullActionMapper.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/NullActionMapper.java Sun Apr 2 10:07:23 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapper;
+import org.apache.struts.webwork.dispatcher.mapper.ActionMapping;
/**
* ActionMapper for testing FilterDispatcher (used in FilterDispaatcherTest)
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/PlainTextResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/PlainTextResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/PlainTextResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/PlainTextResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,17 +2,17 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import com.opensymphony.util.ClassLoaderUtil;
-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 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 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/action2/dispatcher/someJspFile.jsp",
+ "org/apache/struts/webwork/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/action2/dispatcher/someJspFile.jsp"), true);
+ readAsString("org/apache/struts/webwork/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
finally {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java Sun Apr 2 10:07:23 2006
@@ -6,9 +6,9 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
-import org.apache.struts.action2.TestAction;
+import org.apache.struts.webwork.TestAction;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.Interceptor;
import junit.framework.Assert;
@@ -18,7 +18,10 @@
* @author CameronBraid
*/
public class ServletDispatchedTestAssertInterceptor implements Interceptor {
- public ServletDispatchedTestAssertInterceptor() {
+
+ private static final long serialVersionUID = 1980347231443329805L;
+
+ public ServletDispatchedTestAssertInterceptor() {
super();
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import ognl.Ognl;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletDispatcherTest.java Sun Apr 2 10:07:23 2006
@@ -6,7 +6,7 @@
* Created on 2/10/2003
*
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.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/action2/dispatcher/ServletDispatcherTest-xwork.xml";
+ return "org/apache/struts/webwork/dispatcher/ServletDispatcherTest-xwork.xml";
}
public ServletDispatcher getServletDispatcher() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletRedirectResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletRedirectResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletRedirectResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/ServletRedirectResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.mock.MockActionInvocation;
@@ -29,7 +29,6 @@
public class ServletRedirectResultTest extends StrutsTestCase implements StrutsStatics {
protected ServletRedirectResult view;
- private ActionContext oldContext;
private Mock requestMock;
private Mock responseMock;
protected ActionInvocation ai;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/SessionMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/SessionMapTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/SessionMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/SessionMapTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.constraint.Constraint;
import com.mockobjects.constraint.IsAnything;
@@ -117,7 +117,10 @@
* putting new data into the map.
*/
private class MockSessionMap extends SessionMap {
- private Map map = new HashMap();
+
+ private static final long serialVersionUID = 8783604360786273764L;
+
+ private Map map = new HashMap();
public MockSessionMap(HttpServletRequest request) {
super(request);
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/StreamResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/StreamResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/StreamResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/StreamResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.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/webwork/dispatcher/VelocityResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/VelocityResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/VelocityResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/VelocityResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts.webwork.dispatcher;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork.ActionContext;
@@ -101,7 +101,10 @@
}
class TestResult extends StrutsResultSupport {
- public String finalLocation;
+
+ private static final long serialVersionUID = -1512206785088317315L;
+
+ public String finalLocation;
protected void doExecute(String finalLocation, ActionInvocation invocation) throws Exception {
this.finalLocation = finalLocation;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapperTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/DefaultActionMapperTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
import java.util.HashMap;
import java.util.Map;
-import org.apache.struts.action2.dispatcher.ServletRedirectResult;
-import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.webwork.dispatcher.ServletRedirectResult;
+import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
import com.opensymphony.xwork.Result;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapperTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/dispatcher/mapper/RestfulActionMapperTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.dispatcher.mapper;
+package org.apache.struts.webwork.dispatcher.mapper;
import junit.framework.TestCase;
@@ -10,7 +10,7 @@
import java.util.Collections;
import java.util.HashMap;
-import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.webwork.views.jsp.StrutsMockHttpServletRequest;
/**
* Unit test for {@link RestfulActionMapper}.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/CreateSessionInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/CreateSessionInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/CreateSessionInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/CreateSessionInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.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.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.StrutsTestCase;
import com.opensymphony.xwork.mock.MockActionInvocation;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitDelayAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitDelayAction.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitDelayAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitDelayAction.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.xwork.Action;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ExecuteAndWaitInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -3,12 +3,12 @@
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
-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 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 com.opensymphony.xwork.*;
import com.opensymphony.xwork.mock.MockResult;
import com.opensymphony.xwork.config.Configuration;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/FileUploadInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/FileUploadInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/FileUploadInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/FileUploadInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -2,12 +2,12 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.util.ClassLoaderUtil;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsTestCase;
-import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.webwork.dispatcher.multipart.MultiPartRequestWrapper;
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.mock.MockActionInvocation;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -222,7 +222,10 @@
}
private class MyFileupAction extends ActionSupport {
- // no methods
+
+ private static final long serialVersionUID = 6255238895447968889L;
+
+ // no methods
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ServletConfigInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ServletConfigInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ServletConfigInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/ServletConfigInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
-import org.apache.struts.action2.StrutsStatics;
-import org.apache.struts.action2.StrutsTestCase;
-import org.apache.struts.action2.util.ServletContextAware;
+import org.apache.struts.webwork.StrutsStatics;
+import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.webwork.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/webwork/interceptor/StrutsConversionErrorInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/StrutsConversionErrorInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
@@ -11,7 +11,7 @@
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.webwork.StrutsTestCase;
import junit.framework.TestCase;
import java.util.HashMap;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
-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 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 com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/interceptor/TokenSessionStoreInterceptorTest.java Sun Apr 2 10:07:23 2006
@@ -2,11 +2,11 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.interceptor;
+package org.apache.struts.webwork.interceptor;
import com.opensymphony.xwork.ActionProxy;
import com.opensymphony.xwork.Action;
-import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.webwork.TestConfigurationProvider;
/**
* Unit test for {@link TokenSessionStoreInterceptor}.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletApplicationMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletApplicationMapTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletApplicationMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletApplicationMapTest.java Sun Apr 2 10:07:23 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.action2.portlet;
+package org.apache.struts.webwork.portlet;
import java.util.ArrayList;
import java.util.Arrays;
@@ -16,7 +16,6 @@
import java.util.Set;
import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletRequestMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletRequestMapTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletRequestMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletRequestMapTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet;
+package org.apache.struts.webwork.portlet;
import java.util.ArrayList;
import java.util.Arrays;
@@ -14,7 +14,6 @@
import java.util.Set;
import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletSessionMapTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletSessionMapTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletSessionMapTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/PortletSessionMapTest.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,8 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet;
+package org.apache.struts.webwork.portlet;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PortletActionContextTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PortletActionContextTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PortletActionContextTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PortletActionContextTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet.context;
+package org.apache.struts.webwork.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.action2.portlet.PortletActionConstants;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PreparatorServletTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PreparatorServletTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PreparatorServletTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/PreparatorServletTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet.context;
+package org.apache.struts.webwork.portlet.context;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -11,8 +11,7 @@
import org.easymock.MockControl;
-import org.apache.struts.action2.ServletActionContext;
-import com.opensymphony.xwork.ActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/ServletContextHolderListenerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/ServletContextHolderListenerTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/ServletContextHolderListenerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/context/ServletContextHolderListenerTest.java Sun Apr 2 10:07:23 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.action2.portlet.context;
+package org.apache.struts.webwork.portlet.context;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/dispatcher/Jsr168DispatcherTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/dispatcher/Jsr168DispatcherTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/dispatcher/Jsr168DispatcherTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet.dispatcher;
+package org.apache.struts.webwork.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.action2.portlet.PortletActionConstants;
-import org.apache.struts.action2.portlet.context.ServletContextHolderListener;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
+import org.apache.struts.webwork.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/webwork/portlet/result/PortletResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/result/PortletResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/result/PortletResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/result/PortletResultTest.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,8 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet.result;
+package org.apache.struts.webwork.portlet.result;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -23,7 +22,7 @@
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
-import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/PortletUrlHelperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/PortletUrlHelperTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/PortletUrlHelperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/PortletUrlHelperTest.java Sun Apr 2 10:07:23 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.action2.portlet.util;
+package org.apache.struts.webwork.portlet.util;
import java.util.HashMap;
import java.util.Map;
@@ -19,7 +19,7 @@
import org.easymock.MockControl;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.webwork.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionContext;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/StrutsUtilTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/StrutsUtilTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/StrutsUtilTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/portlet/util/StrutsUtilTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.portlet.util;
+package org.apache.struts.webwork.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.action2.TestAction;
-import org.apache.struts.action2.util.ListEntry;
-import org.apache.struts.action2.util.StrutsUtil;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.util.ListEntry;
+import org.apache.struts.webwork.util.StrutsUtil;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
@@ -36,7 +36,7 @@
protected StrutsUtil webWorkUtil = null;
public void testBeanMethod() throws Exception {
- Object o = webWorkUtil.bean("org.apache.struts.action2.TestAction");
+ Object o = webWorkUtil.bean("org.apache.struts.webwork.TestAction");
assertNotNull(o);
assertTrue(o instanceof TestAction);
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/sitegraph/SiteGraphTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/sitegraph/SiteGraphTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/sitegraph/SiteGraphTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/sitegraph/SiteGraphTest.java Sun Apr 2 10:07:23 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.sitegraph;
+package org.apache.struts.webwork.sitegraph;
import com.opensymphony.util.FileUtils;
-import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.webwork.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/action2/sitegraph";
+ String dir = "src/test/org/apache/struts/webwork/sitegraph";
SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
StringWriter writer = new StringWriter();
siteGraph.setWriter(writer);
siteGraph.prepare();
- String out = "src/test/org/apache/struts/action2/sitegraph/out.txt";
+ String out = "src/test/org/apache/struts/webwork/sitegraph/out.txt";
assertEquals(FileUtils.readFile(new File(out)), writer.toString());
}
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.spring;
+package org.apache.struts.webwork.spring;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.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/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
+ ac.setConfigLocations(new String[] {"/org/apache/struts/webwork/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
ac.refresh();
fac.init(msc);
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/util/CounterTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/util/CounterTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/util/CounterTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/util/CounterTest.java Sun Apr 2 10:07:23 2006
@@ -2,7 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.util;
+package org.apache.struts.webwork.util;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org