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 [2/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...
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/util/InvocationSessionStoreTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/util/InvocationSessionStoreTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/util/InvocationSessionStoreTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/util/InvocationSessionStoreTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.util;
+package org.apache.struts.webwork.util;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.webwork.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.action2.util.InvocationSessionStoreTest.invocation";
- private static final String TOKEN_VALUE = "org.apache.struts.action2.util.InvocationSessionStoreTest.token";
+ 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 ActionInvocation invocation;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/util/PrefixTrieTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/util/PrefixTrieTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/util/PrefixTrieTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/util/PrefixTrieTest.java Sun Apr 2 10:07:23 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.util;
+package org.apache.struts.webwork.util;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/util/StrutsTypeConverterTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/util/StrutsTypeConverterTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/util/StrutsTypeConverterTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/util/StrutsTypeConverterTest.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 java.util.Date;
import java.util.HashMap;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/util/TokenHelperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/util/TokenHelperTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/util/TokenHelperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/util/TokenHelperTest.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 java.util.HashMap;
import java.util.Map;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/TemplateEngineManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/TemplateEngineManagerTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/TemplateEngineManagerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/TemplateEngineManagerTest.java Sun Apr 2 10:07:23 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views;
+package org.apache.struts.webwork.views;
-import org.apache.struts.action2.components.template.*;
-import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.webwork.components.template.*;
+import org.apache.struts.webwork.config.Configuration;
import junit.framework.TestCase;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerManagerTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerManagerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerManagerTest.java Sun Apr 2 10:07:23 2006
@@ -2,12 +2,11 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
-import com.mockobjects.servlet.MockServletContext;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.jsp.StrutsMockServletContext;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.views.jsp.StrutsMockServletContext;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/FreemarkerTest.java Sun Apr 2 10:07:23 2006
@@ -6,10 +6,10 @@
* Created on 1/10/2003
*
*/
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
-import org.apache.struts.action2.util.ListEntry;
-import org.apache.struts.action2.util.StrutsUtil;
+import org.apache.struts.webwork.util.ListEntry;
+import org.apache.struts.webwork.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/webwork/views/freemarker/TestAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestAction.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestAction.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestAction.java Sun Apr 2 10:07:23 2006
@@ -1,7 +1,7 @@
/* * Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
import com.opensymphony.xwork.ActionSupport;
@@ -14,9 +14,8 @@
*/
public class TestAction extends ActionSupport {
- /**
- *
- */
+ private static final long serialVersionUID = -762413863731432302L;
+
public TestAction() {
super();
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestBean.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestBean.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/freemarker/TestBean.java Sun Apr 2 10:07:23 2006
@@ -6,7 +6,7 @@
* Created on 1/10/2003
*
*/
-package org.apache.struts.action2.views.freemarker;
+package org.apache.struts.webwork.views.freemarker;
/**
@@ -18,9 +18,6 @@
private String pValue = null;
- /**
- *
- */
public TestBean(String name, String value) {
super();
setName(name);
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,16 +2,16 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.StrutsTestCase;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.ApplicationMap;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
-import org.apache.struts.action2.dispatcher.RequestMap;
-import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.dispatcher.ApplicationMap;
+import org.apache.struts.webwork.dispatcher.DispatcherUtils;
+import org.apache.struts.webwork.dispatcher.RequestMap;
+import org.apache.struts.webwork.dispatcher.SessionMap;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractUITagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractUITagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractUITagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AbstractUITagTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.jsp.ui.AbstractUITag;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.views.jsp.ui.AbstractUITag;
import com.opensymphony.xwork.ActionContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -132,11 +132,11 @@
/**
* Initialize a map of {@link PropertyHolder} for generic tag property testing. Will be used when calling {@link
- * #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])} as properties to
+ * #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag, String, String[])} as properties to
* verify.<p/> This implementation defines testdata for all common AbstractUITag properties and may be overridden in
* subclasses.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
@@ -171,7 +171,7 @@
/**
* Do a generic verification that setting certain properties on a tag causes expected output regarding this
* property. In most cases you would not call this directly, instead use {@link
- * #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])}.
+ * #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag, String, String[])}.
*
* @param tag The fresh created tag instance to test.
* @param theme The theme to use. If <tt>null</tt>, use configured default theme.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ActionTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ActionTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ActionTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ActionTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.TestActionTagResult;
-import org.apache.struts.action2.TestConfigurationProvider;
-import org.apache.struts.action2.components.ActionComponent;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.TestActionTagResult;
+import org.apache.struts.webwork.TestConfigurationProvider;
+import org.apache.struts.webwork.components.ActionComponent;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
@@ -18,7 +18,6 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import java.util.Map;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AnchorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AnchorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AnchorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AnchorTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import org.apache.struts.action2.views.jsp.ui.AnchorTag;
-import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent;
+import org.apache.struts.webwork.views.jsp.ui.AnchorTag;
+import org.apache.struts.webwork.views.jsp.ui.StrutsBodyContent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AppendIteratorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AppendIteratorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AppendIteratorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/AppendIteratorTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag;
+import org.apache.struts.webwork.views.jsp.iterator.AppendIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/BeanTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/BeanTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/BeanTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/BeanTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.jsp.JspException;
@@ -18,7 +18,7 @@
public void testSimple() {
BeanTag tag = new BeanTag();
tag.setPageContext(pageContext);
- tag.setName("org.apache.struts.action2.TestAction");
+ tag.setName("org.apache.struts.webwork.TestAction");
try {
tag.doStartTag();
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseIfTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseIfTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseIfTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseIfTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
@@ -11,8 +11,8 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.components.If;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.components.If;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ElseTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.components.If;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.components.If;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IfTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IfTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IfTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IfTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.webwork.ServletActionContext;
import junit.framework.TestCase;
import javax.servlet.jsp.JspException;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IncludeTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IncludeTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IncludeTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IncludeTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,14 +2,13 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockRequestDispatcher;
-import org.apache.struts.action2.components.Include;
+import org.apache.struts.webwork.components.Include;
import org.easymock.MockControl;
import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
/**
* Unit test of {@link IncludeTag}.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorGeneratorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorGeneratorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorGeneratorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorGeneratorTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import java.util.Iterator;
-import org.apache.struts.action2.util.IteratorGenerator.Converter;
-import org.apache.struts.action2.views.jsp.iterator.IteratorGeneratorTag;
+import org.apache.struts.webwork.util.IteratorGenerator.Converter;
+import org.apache.struts.webwork.views.jsp.iterator.IteratorGeneratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/IteratorTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockBodyContent;
import com.mockobjects.servlet.MockJspWriter;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/MergeIteratorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/MergeIteratorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/MergeIteratorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/MergeIteratorTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag;
+import org.apache.struts.webwork.views.jsp.iterator.MergeIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PortletUrlTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PortletUrlTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PortletUrlTagTest.java Sun Apr 2 10:07:23 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import java.lang.reflect.Field;
import java.util.Arrays;
@@ -41,11 +41,10 @@
import org.jmock.core.Constraint;
import com.mockobjects.servlet.MockJspWriter;
-import org.apache.struts.action2.components.URL;
-import org.apache.struts.action2.portlet.PortletActionConstants;
-import org.apache.struts.action2.portlet.util.PortletUrlHelper;
-import org.apache.struts.action2.views.jsp.ParamTag;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.webwork.portlet.PortletActionConstants;
+import org.apache.struts.webwork.portlet.util.PortletUrlHelper;
+import org.apache.struts.webwork.views.jsp.ParamTag;
+import org.apache.struts.webwork.dispatcher.DispatcherUtils;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PropertyTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PropertyTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PropertyTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PropertyTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.StrutsTestCase;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.StrutsTestCase;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PushTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PushTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PushTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/PushTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.jsp.JspException;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SetTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SetTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SetTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SetTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.jsp.JspException;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SortIteratorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SortIteratorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SortIteratorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SortIteratorTagTest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import org.apache.struts.action2.views.jsp.iterator.SortIteratorTag;
+import org.apache.struts.webwork.views.jsp.iterator.SortIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockBodyContent.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockBodyContent.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockBodyContent.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockBodyContent.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletRequest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletRequest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletRequest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletRequest.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockHttpServletRequest;
import junit.framework.AssertionFailedError;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletResponse.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletResponse.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletResponse.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpServletResponse.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockHttpServletResponse;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpSession.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpSession.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpSession.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockHttpSession.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockHttpSession;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockJspWriter.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockJspWriter.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockJspWriter.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockJspWriter.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,7 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
-
-import com.mockobjects.servlet.MockJspWriter;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.jsp.JspWriter;
import java.io.IOException;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockPageContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockPageContext.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockPageContext.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockPageContext.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import com.mockobjects.servlet.MockPageContext;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockServletContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockServletContext.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockServletContext.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/StrutsMockServletContext.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.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SubsetIteratorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SubsetIteratorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SubsetIteratorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/SubsetIteratorTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.struts.action2.util.SubsetIteratorFilter.Decider;
-import org.apache.struts.action2.views.jsp.iterator.SubsetIteratorTag;
+import org.apache.struts.webwork.util.SubsetIteratorFilter.Decider;
+import org.apache.struts.webwork.views.jsp.iterator.SubsetIteratorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/TextTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/TextTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/TextTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/TextTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,13 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.components.Text;
-import org.apache.struts.action2.views.jsp.ui.TestAction1;
-import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.components.Text;
+import org.apache.struts.webwork.views.jsp.ui.TestAction1;
+import org.apache.struts.webwork.views.jsp.ui.StrutsBodyContent;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -29,7 +29,7 @@
*/
public class TextTagTest extends AbstractTagTest {
- private String fooValue = "org.apache.struts.action2.views.jsp.TextTagTest.fooValue";
+ private String fooValue = "org.apache.struts.webwork.views.jsp.TextTagTest.fooValue";
private TextTag tag;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/URLTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/URLTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/URLTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/URLTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,12 +2,9 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp;
+package org.apache.struts.webwork.views.jsp;
-import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
-import java.io.StringWriter;
-
/**
* Unit test for {@link URLTag}.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AbstractRichtexteditorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AbstractRichtexteditorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AbstractRichtexteditorTest.java Sun Apr 2 10:07:23 2006
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import com.mockobjects.servlet.MockHttpServletResponse;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.ServletActionContext;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.xwork.mock.MockActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionErrorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionErrorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionErrorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionErrorTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,15 +2,15 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.views.jsp.ui.ActionErrorTag;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.ui.ActionErrorTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
@@ -53,6 +53,8 @@
public class InternalActionSupport extends ActionSupport {
+
+ private static final long serialVersionUID = -4777466640658557661L;
private boolean yesActionErrors;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionMessageTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionMessageTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionMessageTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ActionMessageTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
@@ -55,6 +55,8 @@
* @version $Date: 2005/12/22 16:24:22 $ $Id: ActionMessageTagTest.java,v 1.1 2005/12/22 16:24:22 tmjee Exp $
*/
public class InternalActionSupport extends ActionSupport {
+
+ private static final long serialVersionUID = -3230043189352453629L;
private boolean canHaveActionMessage;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AnchorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AnchorTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AnchorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/AnchorTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxListTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxListTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxListTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxListTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,11 +21,11 @@
public class CheckboxListTest extends AbstractUITagTest {
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/CheckboxTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.Map;
@@ -20,11 +20,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComboBoxTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComboBoxTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComboBoxTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComboBoxTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.ArrayList;
-import java.util.Collection;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComponentTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComponentTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ComponentTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DatePickerTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DatePickerTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DatePickerTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DatePickerTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.xwork.ActionContext;
import java.util.Locale;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DateTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DateTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DateTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DateTagTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.views.jsp.AbstractTagTest;
-import org.apache.struts.action2.views.jsp.DateTag;
+import org.apache.struts.webwork.views.jsp.AbstractTagTest;
+import org.apache.struts.webwork.views.jsp.DateTag;
import com.opensymphony.xwork.ActionContext;
import java.text.DateFormat;
@@ -14,7 +14,7 @@
import java.util.Date;
/**
- * Unit test for {@link org.apache.struts.action2.components.Date}.
+ * Unit test for {@link org.apache.struts.webwork.components.Date}.
*
* @author Claus Ibsen
*/
@@ -62,7 +62,7 @@
tag.doStartTag();
// component test must be done between start and end tag
- org.apache.struts.action2.components.Date component = (org.apache.struts.action2.components.Date) tag.getComponent();
+ org.apache.struts.webwork.components.Date component = (org.apache.struts.webwork.components.Date) tag.getComponent();
assertEquals("myDate", component.getName());
assertEquals(format, component.getFormat());
assertEquals(false, component.isNice());
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DebugTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DebugTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DebugTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DebugTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,9 @@
* Copyright (c) 2002-2006 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
* Unit test for {@link DebugTag}.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DivTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DivTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DivTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DivTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DoubleSelectTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DoubleSelectTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DoubleSelectTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/DoubleSelectTest.java Sun Apr 2 10:07:23 2006
@@ -1,7 +1,7 @@
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.ArrayList;
import java.util.Collection;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FieldErrorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FieldErrorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FieldErrorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FieldErrorTagTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import java.util.ArrayList;
import java.util.Collections;
@@ -10,8 +10,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.views.jsp.ParamTag;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.ParamTag;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionSupport;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FileTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FileTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FileTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FileTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.Map;
@@ -41,11 +41,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FormTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FormTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FormTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/FormTagTest.java Sun Apr 2 10:07:23 2006
@@ -2,14 +2,14 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.TestConfigurationProvider;
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.views.jsp.ActionTag;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.TestConfigurationProvider;
+import org.apache.struts.webwork.StrutsConstants;
+import org.apache.struts.webwork.config.Configuration;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.ActionTag;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.config.ConfigurationManager;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HeadTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HeadTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HeadTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HeadTagTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
-import org.apache.struts.action2.components.Head;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.components.Head;
/**
* Unit test for {@link HeadTag}.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HiddenTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HiddenTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HiddenTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/HiddenTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.Map;
import java.util.HashMap;
@@ -35,11 +35,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/JspTemplateTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/JspTemplateTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/JspTemplateTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/JspTemplateTest.java Sun Apr 2 10:07:23 2006
@@ -1,9 +1,9 @@
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/LabelTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/LabelTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/LabelTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/LabelTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.Map;
import java.util.HashMap;
@@ -52,11 +52,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/MockTag.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/MockTag.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/MockTag.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/MockTag.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import javax.servlet.jsp.tagext.BodyTagSupport;
import java.util.Calendar;
@@ -19,7 +19,9 @@
*/
public class MockTag extends BodyTagSupport {
- private static String s;
+ private static final long serialVersionUID = 2694367759647164641L;
+
+ private static String s;
private static Integer i;
private static Double d;
private static Long l;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/OptionTransferSelectTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/OptionTransferSelectTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/OptionTransferSelectTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/OptionTransferSelectTagTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import java.util.ArrayList;
import java.util.List;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
*
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/PasswordTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/PasswordTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/PasswordTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/PasswordTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RadioTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RadioTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RadioTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RadioTest.java Sun Apr 2 10:07:23 2006
@@ -2,13 +2,12 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.HashMap;
-import java.util.ArrayList;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ResetTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ResetTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ResetTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/ResetTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.HashMap;
import java.util.Map;
@@ -85,11 +85,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
* property testing. Will be used when calling {@link #verifyGenericProperties(AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichTextEditorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichTextEditorTagTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichTextEditorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichTextEditorTagTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import java.util.Locale;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import com.opensymphony.xwork.ActionContext;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
+import org.apache.struts.webwork.components.AbstractRichtexteditorConnector;
/**
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
+import org.apache.struts.webwork.components.AbstractRichtexteditorConnector;
/**
*
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
+import org.apache.struts.webwork.components.AbstractRichtexteditorConnector;
/**
*
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
+import org.apache.struts.webwork.components.AbstractRichtexteditorConnector;
/**
* Test case for RichtexteditorGetFoldersResultTest.
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SelectTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SelectTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SelectTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SelectTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.math.BigDecimal;
import java.util.ArrayList;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/StrutsBodyContent.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/StrutsBodyContent.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/StrutsBodyContent.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/StrutsBodyContent.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitAjaxTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitAjaxTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitAjaxTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitAjaxTest.java Sun Apr 2 10:07:23 2006
@@ -2,9 +2,9 @@
* Copyright: Copyright (c) From Down & Around, Inc.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
/**
* @author Ian Roughley
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/SubmitTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.Map;
import java.util.HashMap;
@@ -199,11 +199,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TestAction1.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TestAction1.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TestAction1.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TestAction1.java Sun Apr 2 10:07:23 2006
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2004 Opensymphony. All Rights Reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
import com.opensymphony.xwork.ActionSupport;
@@ -11,4 +11,6 @@
* @author Jason Carreira <jc...@eplus.com>
*/
public class TestAction1 extends ActionSupport {
+
+ private static final long serialVersionUID = 2545551979978561327L;
}
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextareaTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextareaTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextareaTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextareaTest.java Sun Apr 2 10:07:23 2006
@@ -2,10 +2,10 @@
* Copyright (c) 2002-2003 by OpenSymphony
* All rights reserved.
*/
-package org.apache.struts.action2.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import java.util.Map;
@@ -43,11 +43,11 @@
}
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
Modified: incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextfieldTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextfieldTest.java?rev=390860&r1=390850&r2=390860&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextfieldTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/webwork/views/jsp/ui/TextfieldTest.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.views.jsp.ui;
+package org.apache.struts.webwork.views.jsp.ui;
-import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.views.freemarker.tags.TextFieldModel;
-import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.webwork.TestAction;
+import org.apache.struts.webwork.views.freemarker.tags.TextFieldModel;
+import org.apache.struts.webwork.views.jsp.AbstractUITagTest;
import freemarker.template.TransformControl;
import java.util.HashMap;
@@ -20,11 +20,11 @@
public class TextfieldTest extends AbstractUITagTest {
/**
- * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
- * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
+ * Initialize a map of {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+ * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.webwork.views.jsp.ui.AbstractUITag,
* String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
*
- * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+ * @return A Map of PropertyHolders values bound to {@link org.apache.struts.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
* as key.
*/
protected Map initializedGenericTagTestProperties() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org