You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/03/29 02:52:51 UTC
svn commit: r389643 [4/4] - in /incubator/webwork2: ./ src/etc/ src/java/
src/java/org/apache/struts/action2/
src/java/org/apache/struts/action2/components/
src/java/org/apache/struts/action2/components/ajax/
src/java/org/apache/struts/action2/componen...
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java Tue Mar 28 16:52:39 2006
@@ -4,8 +4,8 @@
*/
package org.apache.struts.action2.interceptor;
-import org.apache.struts.action2.WebWorkStatics;
-import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.action2.StrutsTestCase;
import org.apache.struts.action2.util.ServletContextAware;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.Action;
@@ -26,7 +26,7 @@
*
* @author Claus Ibsen
*/
-public class ServletConfigInterceptorTest extends WebWorkTestCase {
+public class ServletConfigInterceptorTest extends StrutsTestCase {
private ServletConfigInterceptor interceptor;
@@ -37,7 +37,7 @@
MockHttpServletRequest req = new MockHttpServletRequest();
MockActionInvocation mai = createActionInvocation(mock);
- mai.getInvocationContext().put(WebWorkStatics.HTTP_REQUEST, req);
+ mai.getInvocationContext().put(StrutsStatics.HTTP_REQUEST, req);
mock.setServletRequest((HttpServletRequest) req);
control.setVoidCallable();
@@ -54,7 +54,7 @@
MockHttpServletResponse res = new MockHttpServletResponse();
MockActionInvocation mai = createActionInvocation(mock);
- mai.getInvocationContext().put(WebWorkStatics.HTTP_RESPONSE, res);
+ mai.getInvocationContext().put(StrutsStatics.HTTP_RESPONSE, res);
mock.setServletResponse((HttpServletResponse) res);
control.setVoidCallable();
@@ -123,7 +123,7 @@
MockActionInvocation mai = createActionInvocation(mock);
MockServletContext ctx = new MockServletContext();
- mai.getInvocationContext().put(WebWorkStatics.SERVLET_CONTEXT, ctx);
+ mai.getInvocationContext().put(StrutsStatics.SERVLET_CONTEXT, ctx);
mock.setPrincipalProxy(null); // we can do this because of ALWAYS_MATCHER
control.setVoidCallable();
@@ -141,7 +141,7 @@
MyPrincipalAction action = new MyPrincipalAction();
MockActionInvocation mai = createActionInvocation(action);
- mai.getInvocationContext().put(WebWorkStatics.HTTP_REQUEST, req);
+ mai.getInvocationContext().put(StrutsStatics.HTTP_REQUEST, req);
assertNull(action.getProxy());
interceptor.intercept(mai);
@@ -163,7 +163,7 @@
MockActionInvocation mai = createActionInvocation(mock);
MockServletContext ctx = new MockServletContext();
- mai.getInvocationContext().put(WebWorkStatics.SERVLET_CONTEXT, ctx);
+ mai.getInvocationContext().put(StrutsStatics.SERVLET_CONTEXT, ctx);
mock.setServletContext((ServletContext) ctx);
control.setVoidCallable();
Copied: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptorTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptorTest.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java Tue Mar 28 16:52:39 2006
@@ -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.WebWorkTestCase;
+import org.apache.struts.action2.StrutsTestCase;
import junit.framework.TestCase;
import java.util.HashMap;
@@ -19,19 +19,19 @@
/**
- * WebWorkConversionErrorInterceptorTest
+ * StrutsConversionErrorInterceptorTest
*
* @author Jason Carreira
* Date: Nov 27, 2003 10:11:42 PM
*/
-public class WebWorkConversionErrorInterceptorTest extends WebWorkTestCase {
+public class StrutsConversionErrorInterceptorTest extends StrutsTestCase {
protected ActionContext context;
protected ActionInvocation invocation;
protected Map conversionErrors;
protected Mock mockInvocation;
protected OgnlValueStack stack;
- protected WebWorkConversionErrorInterceptor interceptor;
+ protected StrutsConversionErrorInterceptor interceptor;
public void testEmptyValuesDoNotSetFieldErrors() throws Exception {
@@ -68,7 +68,7 @@
protected void setUp() throws Exception {
super.setUp();
- interceptor = new WebWorkConversionErrorInterceptor();
+ interceptor = new StrutsConversionErrorInterceptor();
mockInvocation = new Mock(ActionInvocation.class);
invocation = (ActionInvocation) mockInvocation.proxy();
stack = new OgnlValueStack();
Modified: incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java Tue Mar 28 16:52:39 2006
@@ -7,8 +7,8 @@
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.WebWorkMockHttpServletRequest;
-import org.apache.struts.action2.views.jsp.WebWorkMockHttpSession;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpSession;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionProxy;
@@ -36,7 +36,7 @@
Map extraContext;
Map params;
Map session;
- WebWorkMockHttpServletRequest request;
+ StrutsMockHttpServletRequest request;
public void testNoTokenInParams() throws Exception {
@@ -101,8 +101,8 @@
extraContext.put(ActionContext.SESSION, session);
extraContext.put(ActionContext.PARAMETERS, params);
- request = new WebWorkMockHttpServletRequest();
- httpSession = new WebWorkMockHttpSession();
+ request = new StrutsMockHttpServletRequest();
+ httpSession = new StrutsMockHttpSession();
request.setSession(httpSession);
request.setParameterMap(params);
extraContext.put(ServletActionContext.HTTP_REQUEST, request);
Copied: incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/WebWorkUtilTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/WebWorkUtilTest.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/WebWorkUtilTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java Tue Mar 28 16:52:39 2006
@@ -17,23 +17,23 @@
import org.apache.struts.action2.TestAction;
import org.apache.struts.action2.util.ListEntry;
-import org.apache.struts.action2.util.WebWorkUtil;
+import org.apache.struts.action2.util.StrutsUtil;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
/**
- * Test case for WebWorkUtil.
+ * Test case for StrutsUtil.
*
* @author tm_jee
- * @version $Date: 2006/03/14 16:48:21 $ $Id: WebWorkUtilTest.java,v 1.1 2006/03/14 16:48:21 tmjee Exp $
+ * @version $Date: 2006/03/14 16:48:21 $ $Id: StrutsUtilTest.java,v 1.1 2006/03/14 16:48:21 tmjee Exp $
*/
-public class WebWorkUtilTest extends TestCase {
+public class StrutsUtilTest extends TestCase {
protected OgnlValueStack stack = null;
protected InternalMockHttpServletRequest request = null;
protected MockHttpServletResponse response = null;
- protected WebWorkUtil webWorkUtil = null;
+ protected StrutsUtil webWorkUtil = null;
public void testBeanMethod() throws Exception {
Object o = webWorkUtil.bean("org.apache.struts.action2.TestAction");
@@ -190,7 +190,7 @@
stack = new OgnlValueStack();
request = new InternalMockHttpServletRequest();
response = new MockHttpServletResponse();
- webWorkUtil = new WebWorkUtil(stack, request, response);
+ webWorkUtil = new StrutsUtil(stack, request, response);
}
protected void tearDown() throws Exception {
Modified: incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java Tue Mar 28 16:52:39 2006
@@ -1,7 +1,7 @@
package org.apache.struts.action2.sitegraph;
import com.opensymphony.util.FileUtils;
-import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.StrutsTestCase;
import java.io.File;
import java.io.StringWriter;
@@ -11,7 +11,7 @@
* Date: Jun 25, 2005
* Time: 4:18:28 PM
*/
-public class SiteGraphTest extends WebWorkTestCase {
+public class SiteGraphTest extends StrutsTestCase {
public void testWebFlow() {
String dir = "src/test/org/apache/struts/action2/sitegraph";
SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
Modified: incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/xwork.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/xwork.xml?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/xwork.xml (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/xwork.xml Tue Mar 28 16:52:39 2006
@@ -1,16 +1,16 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
<xwork>
- <include file="webwork-default.xml"/>
+ <include file="struts-default.xml"/>
- <package name="default" extends="webwork-default">
+ <package name="default" extends="struts-default">
<action name="hello" class="com.opensymphony.xwork.ActionSupport">
<result name="success">hello.jsp</result>
<result name="tutorial" type="redirect">/tutorial/test.action</result>
</action>
</package>
- <package name="tutorial" namespace="/tutorial" extends="webwork-default">
+ <package name="tutorial" namespace="/tutorial" extends="struts-default">
<result-types>
<result-type name="freemarker" default="true"
class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
@@ -21,7 +21,7 @@
</action>
</package>
- <package name="sitegraph" namespace="/tutorial/sitegraph" extends="webwork-default">
+ <package name="sitegraph" namespace="/tutorial/sitegraph" extends="struts-default">
<result-types>
<result-type name="freemarker" default="true"
class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
Copied: incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java Tue Mar 28 16:52:39 2006
@@ -4,7 +4,7 @@
*/
package org.apache.struts.action2.spring;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.struts.action2.config.Configuration;
import junit.framework.TestCase;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -16,16 +16,16 @@
import javax.servlet.ServletContext;
/**
- * Unit test for {@link WebWorkSpringObjectFactory}.
+ * Unit test for {@link StrutsSpringObjectFactory}.
*
* @author Claus Ibsen
- * @version $Date: 2006/03/14 16:49:54 $ $Id: WebWorkSpringObjectFactoryTest.java,v 1.2 2006/03/14 16:49:54 tmjee Exp $
+ * @version $Date: 2006/03/14 16:49:54 $ $Id: StrutsSpringObjectFactoryTest.java,v 1.2 2006/03/14 16:49:54 tmjee Exp $
*/
-public class WebWorkSpringObjectFactoryTest extends TestCase {
+public class StrutsSpringObjectFactoryTest extends TestCase {
public void testNoSpringContext() throws Exception {
// to cover situations where there will be logged an error
- WebWorkSpringObjectFactory fac = new WebWorkSpringObjectFactory();
+ StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory();
ServletContext msc = (ServletContext) new MockServletContext();
fac.init(msc);
@@ -33,16 +33,16 @@
}
public void testWithSpringContext() throws Exception {
- WebWorkSpringObjectFactory fac = new WebWorkSpringObjectFactory();
+ StrutsSpringObjectFactory fac = new StrutsSpringObjectFactory();
// autowire by constructure, we try a non default setting in this unit test
- Configuration.set(WebWorkConstants.WEBWORK_OBJECTFACTORY_SPRING_AUTOWIRE, "constructor");
+ Configuration.set(StrutsConstants.STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE, "constructor");
ConfigurableWebApplicationContext ac = new XmlWebApplicationContext();
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/WebWorkSpringObjectFactoryTest-applicationContext.xml"});
+ ac.setConfigLocations(new String[] {"/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
ac.refresh();
fac.init(msc);
Modified: incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java Tue Mar 28 16:52:39 2006
@@ -5,7 +5,7 @@
package org.apache.struts.action2.util;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.ActionProxy;
@@ -20,7 +20,7 @@
*
* @author Jason Carreira Created Apr 12, 2003 10:34:53 PM
*/
-public class InvocationSessionStoreTest extends WebWorkTestCase {
+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";
Copied: incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/util/WebWorkTypeConverterTest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/util/WebWorkTypeConverterTest.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/util/WebWorkTypeConverterTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java Tue Mar 28 16:52:39 2006
@@ -12,12 +12,12 @@
/**
- * Test case for WebWork Type Converter.
+ * Test case for Struts Type Converter.
*
* @author tm_jee
- * @version $Date: 2006/03/14 17:35:38 $ $Id: WebWorkTypeConverterTest.java,v 1.1 2006/03/14 17:35:38 tmjee Exp $
+ * @version $Date: 2006/03/14 17:35:38 $ $Id: StrutsTypeConverterTest.java,v 1.1 2006/03/14 17:35:38 tmjee Exp $
*/
-public class WebWorkTypeConverterTest extends TestCase {
+public class StrutsTypeConverterTest extends TestCase {
/**
* Typically form webwork -> html
@@ -25,19 +25,19 @@
* @throws Exception
*/
public void testConvertToString() throws Exception {
- InternalWebWorkTypeConverter webWorkTypeConverter = new InternalWebWorkTypeConverter();
+ InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
webWorkTypeConverter.convertValue(new HashMap(), "", String.class);
assertTrue(webWorkTypeConverter.isConvertToString);
assertEquals(webWorkTypeConverter.objToBeConverted, "");
}
/**
- * Typically form html -> WebWork
+ * Typically form html -> Struts
*
* @throws Exception
*/
public void testConvertFromString() throws Exception {
- InternalWebWorkTypeConverter webWorkTypeConverter = new InternalWebWorkTypeConverter();
+ InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
webWorkTypeConverter.convertValue(new HashMap(), "12/12/1997", Date.class);
assertTrue(webWorkTypeConverter.isConvertFromString);
assertTrue(webWorkTypeConverter.objToBeConverted instanceof String[]);
@@ -45,13 +45,13 @@
}
/**
- * Typically from html -> WebWork (in array due to the nature of html, param
+ * Typically from html -> Struts (in array due to the nature of html, param
* being able to have many values).
*
* @throws Exception
*/
public void testConvertFromStringInArrayForm() throws Exception {
- InternalWebWorkTypeConverter webWorkTypeConverter = new InternalWebWorkTypeConverter();
+ InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
webWorkTypeConverter.convertValue(new HashMap(), new String[] { "12/12/1997", "1/1/1977" }, Date.class);
assertTrue(webWorkTypeConverter.isConvertFromString);
assertTrue(webWorkTypeConverter.objToBeConverted instanceof String[]);
@@ -60,13 +60,13 @@
public void testFallbackConversion() throws Exception {
- InternalWebWorkTypeConverter webWorkTypeConverter = new InternalWebWorkTypeConverter();
+ InternalStrutsTypeConverter webWorkTypeConverter = new InternalStrutsTypeConverter();
webWorkTypeConverter.convertValue(new HashMap(), new Object(), Date.class);
assertTrue(webWorkTypeConverter.fallbackConversion);
}
// === internal class for testing
- class InternalWebWorkTypeConverter extends WebWorkTypeConverter {
+ class InternalStrutsTypeConverter extends StrutsTypeConverter {
boolean isConvertFromString = false;
boolean isConvertToString = false;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java Tue Mar 28 16:52:39 2006
@@ -5,9 +5,9 @@
package org.apache.struts.action2.views.freemarker;
import com.mockobjects.servlet.MockServletContext;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.jsp.WebWorkMockServletContext;
+import org.apache.struts.action2.views.jsp.StrutsMockServletContext;
import junit.framework.TestCase;
@@ -20,8 +20,8 @@
public class FreemarkerManagerTest extends TestCase {
public void testIfWebworkEncodingIsSetProperty() throws Exception {
- Configuration.set(WebWorkConstants.WEBWORK_I18N_ENCODING, "UTF-8");
- WebWorkMockServletContext servletContext = new WebWorkMockServletContext();
+ Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
+ StrutsMockServletContext servletContext = new StrutsMockServletContext();
servletContext.setAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY, null);
freemarker.template.Configuration conf = FreemarkerManager.getInstance().getConfiguration(servletContext);
assertEquals(conf.getDefaultEncoding(), "UTF-8");
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java Tue Mar 28 16:52:39 2006
@@ -9,7 +9,7 @@
package org.apache.struts.action2.views.freemarker;
import org.apache.struts.action2.util.ListEntry;
-import org.apache.struts.action2.util.WebWorkUtil;
+import org.apache.struts.action2.util.StrutsUtil;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
import freemarker.ext.beans.CollectionModel;
@@ -36,7 +36,7 @@
public void testSelectHelper() {
- WebWorkUtil wwUtil = new WebWorkUtil(ActionContext.getContext().getValueStack(), null, null);
+ StrutsUtil wwUtil = new StrutsUtil(ActionContext.getContext().getValueStack(), null, null);
List selectList = null;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java Tue Mar 28 16:52:39 2006
@@ -6,7 +6,7 @@
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.TestAction;
-import org.apache.struts.action2.WebWorkTestCase;
+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;
@@ -28,7 +28,7 @@
*
* @author jcarreira
*/
-public abstract class AbstractTagTest extends WebWorkTestCase {
+public abstract class AbstractTagTest extends StrutsTestCase {
protected Action action;
protected Map context;
protected Map session;
@@ -38,10 +38,10 @@
* contains the buffer that our unit test will write to. we can later verify this buffer for correctness.
*/
protected StringWriter writer;
- protected WebWorkMockHttpServletRequest request;
- protected WebWorkMockPageContext pageContext;
+ protected StrutsMockHttpServletRequest request;
+ protected StrutsMockPageContext pageContext;
protected HttpServletResponse response;
- protected WebWorkMockServletContext servletContext;
+ protected StrutsMockServletContext servletContext;
/**
* Constructs the action that we're going to test against. For most UI tests, this default action should be enough.
@@ -64,21 +64,21 @@
context = stack.getContext();
stack.push(action);
- request = new WebWorkMockHttpServletRequest();
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
- response = new WebWorkMockHttpServletResponse();
- request.setSession(new WebWorkMockHttpSession());
+ request = new StrutsMockHttpServletRequest();
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
+ response = new StrutsMockHttpServletResponse();
+ request.setSession(new StrutsMockHttpSession());
request.setupGetServletPath("/");
writer = new StringWriter();
- JspWriter jspWriter = new WebWorkMockJspWriter(writer);
+ JspWriter jspWriter = new StrutsMockJspWriter(writer);
- servletContext = new WebWorkMockServletContext();
+ servletContext = new StrutsMockServletContext();
servletContext.setRealPath(new File("nosuchfile.properties").getAbsolutePath());
servletContext.setServletInfo("Resin");
- pageContext = new WebWorkMockPageContext();
+ pageContext = new StrutsMockPageContext();
pageContext.setRequest(request);
pageContext.setResponse(response);
pageContext.setJspWriter(jspWriter);
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java Tue Mar 28 16:52:39 2006
@@ -5,7 +5,7 @@
package org.apache.struts.action2.views.jsp;
import org.apache.struts.action2.views.jsp.ui.AnchorTag;
-import org.apache.struts.action2.views.jsp.ui.WebWorkBodyContent;
+import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
@@ -37,7 +37,7 @@
tag.setHref("/TestAction.action");
String bodyText = "<img src=\"#\"/>";
try {
- WebWorkBodyContent bodyContent = new WebWorkBodyContent(null);
+ StrutsBodyContent bodyContent = new StrutsBodyContent(null);
bodyContent.print(bodyText);
tag.setBodyContent(bodyContent);
@@ -59,7 +59,7 @@
tag = new AnchorTag();
tag.setPageContext(pageContext);
- JspWriter jspWriter = new WebWorkMockJspWriter(writer);
+ JspWriter jspWriter = new StrutsMockJspWriter(writer);
pageContext.setJspWriter(jspWriter);
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java Tue Mar 28 16:52:39 2006
@@ -87,9 +87,9 @@
jspWriter = new MockJspWriter();
- WebWorkMockHttpServletRequest request = new WebWorkMockHttpServletRequest();
+ StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
- WebWorkMockServletContext servletContext = new WebWorkMockServletContext();
+ StrutsMockServletContext servletContext = new StrutsMockServletContext();
servletContext.setServletInfo("not-weblogic");
pageContext = new MockPageContext();
@@ -97,7 +97,7 @@
pageContext.setRequest(request);
pageContext.setServletContext(servletContext);
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java Tue Mar 28 16:52:39 2006
@@ -79,17 +79,17 @@
stack = new OgnlValueStack();
// create the mock http servlet request
- WebWorkMockHttpServletRequest request = new WebWorkMockHttpServletRequest();
+ StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
// NOTE: in WW Tag library, TagUtil gets stack from request, which will be set
// when request going through the FilterDispatcher --> DispatcherUtil etc. route
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
- WebWorkMockServletContext servletContext = new WebWorkMockServletContext();
+ StrutsMockServletContext servletContext = new StrutsMockServletContext();
servletContext.setServletInfo("not-weblogic");
// create the mock page context
- pageContext = new WebWorkMockPageContext();
+ pageContext = new StrutsMockPageContext();
pageContext.setRequest(request);
pageContext.setServletContext(servletContext);
pageContext.setJspWriter(new MockJspWriter());
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/IfTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/IfTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/IfTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/IfTagTest.java Tue Mar 28 16:52:39 2006
@@ -145,9 +145,9 @@
stack = new OgnlValueStack();
// create the mock http servlet request
- WebWorkMockHttpServletRequest request = new WebWorkMockHttpServletRequest();
+ StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
ActionContext.getContext().setValueStack(stack);
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
// create the mock page context
pageContext = new MockPageContext();
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java Tue Mar 28 16:52:39 2006
@@ -103,7 +103,7 @@
mockHttpReq.stubs().method("getScheme").will(returnValue("http"));
mockHttpReq.stubs().method("getAttribute").with(
- eq("webwork.valueStack")).will(returnValue(stack));
+ eq("struts.valueStack")).will(returnValue(stack));
mockHttpReq.stubs().method("getAttribute").with(
eq("javax.portlet.response")).will(
returnValue((PortletResponse) mockPortletRes.proxy()));
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java Tue Mar 28 16:52:39 2006
@@ -7,8 +7,8 @@
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.WebWorkTestCase;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.struts.action2.config.Configuration;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -22,9 +22,9 @@
* @author $Author: plightbo $
* @version $Revision: 1.13 $
*/
-public class PropertyTagTest extends WebWorkTestCase {
+public class PropertyTagTest extends StrutsTestCase {
- WebWorkMockHttpServletRequest request = new WebWorkMockHttpServletRequest();
+ StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
OgnlValueStack stack = new OgnlValueStack();
@@ -149,8 +149,8 @@
public void testWithAltSyntax1() throws Exception {
// setups
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "true");
- assertEquals(Configuration.get(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "true");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
+ assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
Foo foo = new Foo();
foo.setTitle("tm_jee");
@@ -178,8 +178,8 @@
public void testWithAltSyntax2() throws Exception {
// setups
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "true");
- assertEquals(Configuration.get(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "true");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
+ assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
Foo foo = new Foo();
foo.setTitle("tm_jee");
@@ -207,8 +207,8 @@
public void testWithoutAltSyntax1() throws Exception {
// setups
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "false");
- assertEquals(Configuration.get(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "false");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
+ assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
Foo foo = new Foo();
foo.setTitle("tm_jee");
@@ -237,8 +237,8 @@
public void testWithoutAltSyntax2() throws Exception {
// setups
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "false");
- assertEquals(Configuration.get(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "false");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
+ assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
Foo foo = new Foo();
foo.setTitle("tm_jee");
@@ -267,7 +267,7 @@
protected void setUp() throws Exception {
super.setUp();
ActionContext.getContext().setValueStack(stack);
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/SetTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/SetTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/SetTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/SetTagTest.java Tue Mar 28 16:52:39 2006
@@ -56,7 +56,7 @@
assertEquals("chewie", session.get("foo"));
}
- public void testWebWorkScope() throws JspException {
+ public void testStrutsScope() throws JspException {
tag.setName("foo");
tag.setValue("name");
tag.doStartTag();
@@ -64,7 +64,7 @@
assertEquals("chewie", context.get("foo"));
}
- public void testWebWorkScope2() throws JspException {
+ public void testStrutsScope2() throws JspException {
tag.setName("chewie");
tag.doStartTag();
tag.doEndTag();
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockBodyContent.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockBodyContent.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockBodyContent.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java Tue Mar 28 16:52:39 2006
@@ -12,18 +12,18 @@
/**
- * WebWorkMockBodyContent
+ * StrutsMockBodyContent
*
* @author Jason Carreira
* Date: Mar 15, 2004 10:50:56 PM
*/
-public class WebWorkMockBodyContent extends BodyContent {
+public class StrutsMockBodyContent extends BodyContent {
private JspWriter jspWriter;
private String body = null;
- public WebWorkMockBodyContent(JspWriter jspWriter) {
+ public StrutsMockBodyContent(JspWriter jspWriter) {
super(jspWriter);
this.jspWriter = jspWriter;
}
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletRequest.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletRequest.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletRequest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java Tue Mar 28 16:52:39 2006
@@ -13,12 +13,12 @@
/**
- * WebWorkMockHttpServletRequest
+ * StrutsMockHttpServletRequest
*
* @author Jason Carreira
* Created Mar 28, 2003 10:28:50 PM
*/
-public class WebWorkMockHttpServletRequest extends MockHttpServletRequest {
+public class StrutsMockHttpServletRequest extends MockHttpServletRequest {
Locale locale = Locale.US;
private Map attributes = new HashMap();
@@ -155,7 +155,7 @@
}
if (session == null) {
- session = new WebWorkMockHttpSession();
+ session = new StrutsMockHttpSession();
setSession(session);
}
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletResponse.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletResponse.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletResponse.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java Tue Mar 28 16:52:39 2006
@@ -13,13 +13,13 @@
/**
- * WebWorkMockHttpServletResponse
+ * StrutsMockHttpServletResponse
*
* @author Jason Carreira
* @author tm_jee
- * @version $Date: 2006/03/11 06:23:02 $ $Id: WebWorkMockHttpServletResponse.java,v 1.6 2006/03/11 06:23:02 tmjee Exp $
+ * @version $Date: 2006/03/11 06:23:02 $ $Id: StrutsMockHttpServletResponse.java,v 1.6 2006/03/11 06:23:02 tmjee Exp $
*/
-public class WebWorkMockHttpServletResponse extends MockHttpServletResponse {
+public class StrutsMockHttpServletResponse extends MockHttpServletResponse {
private Locale locale;
private PrintWriter writer;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpSession.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpSession.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpSession.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java Tue Mar 28 16:52:39 2006
@@ -11,12 +11,12 @@
/**
- * WebWorkMockHttpSession
+ * StrutsMockHttpSession
*
* @author Jason Carreira
* Created Jun 5, 2003 9:26:31 PM
*/
-public class WebWorkMockHttpSession extends MockHttpSession {
+public class StrutsMockHttpSession extends MockHttpSession {
Hashtable attributes = new Hashtable();
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockJspWriter.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockJspWriter.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockJspWriter.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java Tue Mar 28 16:52:39 2006
@@ -18,10 +18,10 @@
* <p/>
* todo replace this once MockJspWriter implements Writer correctly (i.e. doesn't throw NotImplementException)
*/
-public class WebWorkMockJspWriter extends JspWriter {
+public class StrutsMockJspWriter extends JspWriter {
StringWriter writer;
- public WebWorkMockJspWriter(StringWriter writer) {
+ public StrutsMockJspWriter(StringWriter writer) {
super(1024, true);
this.writer = writer;
}
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockPageContext.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockPageContext.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockPageContext.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java Tue Mar 28 16:52:39 2006
@@ -20,7 +20,7 @@
* Time: 5:52:36 PM
* To change this template use Options | File Templates.
*/
-public class WebWorkMockPageContext extends MockPageContext {
+public class StrutsMockPageContext extends MockPageContext {
private Map attributes = new HashMap();
private ServletResponse response;
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockServletContext.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockServletContext.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockServletContext.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java Tue Mar 28 16:52:39 2006
@@ -15,13 +15,13 @@
/**
- * WebWorkMockServletContext
+ * StrutsMockServletContext
*
* @author Jason Carreira
* @author tm_jee
- * @version $Date: 2006/03/11 06:23:02 $ $Id: WebWorkMockServletContext.java,v 1.6 2006/03/11 06:23:02 tmjee Exp $
+ * @version $Date: 2006/03/11 06:23:02 $ $Id: StrutsMockServletContext.java,v 1.6 2006/03/11 06:23:02 tmjee Exp $
*/
-public class WebWorkMockServletContext implements ServletContext {
+public class StrutsMockServletContext implements ServletContext {
String realPath;
String servletInfo;
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/TextTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/TextTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/TextTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/TextTagTest.java Tue Mar 28 16:52:39 2006
@@ -8,7 +8,7 @@
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.WebWorkBodyContent;
+import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -139,7 +139,7 @@
OgnlValueStack newStack = new OgnlValueStack();
newStack.getContext().put(ActionContext.LOCALE, foreignLocale);
newStack.push(new TestAction1());
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, newStack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, newStack);
assertNotSame(ActionContext.getContext().getValueStack().peek(), newStack.peek());
tag.doStartTag();
@@ -170,7 +170,7 @@
OgnlValueStack newStack = new OgnlValueStack(stack);
newStack.getContext().put(ActionContext.LOCALE, foreignLocale);
assertNotSame(newStack.getContext().get(ActionContext.LOCALE), ActionContext.getContext().getLocale());
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, newStack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, newStack);
assertEquals(ActionContext.getContext().getValueStack().peek(), newStack.peek());
tag.doStartTag();
tag.doEndTag();
@@ -182,7 +182,7 @@
final String bodyText = "body text";
tag.setName(key);
- WebWorkBodyContent bodyContent = new WebWorkBodyContent(null);
+ StrutsBodyContent bodyContent = new StrutsBodyContent(null);
bodyContent.print(bodyText);
tag.setBodyContent(bodyContent);
tag.doStartTag();
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/URLTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/URLTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/URLTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/URLTagTest.java Tue Mar 28 16:52:39 2006
@@ -28,9 +28,9 @@
}
public void testAddParameters() throws Exception {
- request.setAttribute("webwork.request_uri", "/Test.action");
+ request.setAttribute("struts.request_uri", "/Test.action");
- request.setAttribute("webwork.request_uri", "/TestAction.action");
+ request.setAttribute("struts.request_uri", "/TestAction.action");
request.setQueryString("param0=value0");
tag.doStartTag();
@@ -272,7 +272,7 @@
tag = new URLTag();
tag.setPageContext(pageContext);
- JspWriter jspWriter = new WebWorkMockJspWriter(writer);
+ JspWriter jspWriter = new StrutsMockJspWriter(writer);
pageContext.setJspWriter(jspWriter);
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java Tue Mar 28 16:52:39 2006
@@ -6,7 +6,7 @@
import org.apache.struts.action2.TestAction;
import org.apache.struts.action2.TestConfigurationProvider;
-import org.apache.struts.action2.WebWorkConstants;
+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;
@@ -108,13 +108,13 @@
* Testing that this: <p>
* <ww:form name="'myForm'" namespace="'/testNamespace'" action="'testNamespaceAction'" method="'POST'">
* <p/>
- * doesn't create an action of "/testNamespace/testNamespaceAction.action" when the "webwork.action.extension"
+ * doesn't create an action of "/testNamespace/testNamespaceAction.action" when the "struts.action.extension"
* config property is set to "jspa".
*/
public void testFormTagWithDifferentActionExtension() throws Exception {
request.setupGetServletPath("/testNamespace/testNamespaceAction");
- String oldConfiguration = (String) Configuration.get(WebWorkConstants.WEBWORK_ACTION_EXTENSION);
- Configuration.set(WebWorkConstants.WEBWORK_ACTION_EXTENSION, "jspa");
+ String oldConfiguration = (String) Configuration.get(StrutsConstants.STRUTS_ACTION_EXTENSION);
+ Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "jspa");
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
@@ -126,12 +126,12 @@
tag.doStartTag();
tag.doEndTag();
- Configuration.set(WebWorkConstants.WEBWORK_ACTION_EXTENSION, oldConfiguration);
+ Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, oldConfiguration);
verify(FormTag.class.getResource("Formtag-5.txt"));
// set it back to the default
- Configuration.set(WebWorkConstants.WEBWORK_ACTION_EXTENSION, "action");
+ Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "action");
}
/**
@@ -324,8 +324,8 @@
public void testFormWithActionAndExtension() throws Exception {
request.setupGetServletPath("/BLA");
- String oldConfiguration = (String) Configuration.get(WebWorkConstants.WEBWORK_ACTION_EXTENSION);
- Configuration.set(WebWorkConstants.WEBWORK_ACTION_EXTENSION, "jspa");
+ String oldConfiguration = (String) Configuration.get(StrutsConstants.STRUTS_ACTION_EXTENSION);
+ Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "jspa");
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
@@ -335,12 +335,12 @@
tag.doStartTag();
tag.doEndTag();
- Configuration.set(WebWorkConstants.WEBWORK_ACTION_EXTENSION, oldConfiguration);
+ Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, oldConfiguration);
verify(FormTag.class.getResource("Formtag-8.txt"));
// set it back to the default
- Configuration.set(WebWorkConstants.WEBWORK_ACTION_EXTENSION, "action");
+ Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "action");
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java Tue Mar 28 16:52:39 2006
@@ -10,7 +10,7 @@
/**
* Unit test for {@link HeadTag}.
* <p/>
- * Note: If unit test fails with encoding difference check the src/test/webwork.properties
+ * Note: If unit test fails with encoding difference check the src/test/struts.properties
* and adjust the .txt files accordingly
*
* @author Claus Ibsen
Copied: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java (from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/WebWorkBodyContent.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java?p2=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java&p1=incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/WebWorkBodyContent.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/WebWorkBodyContent.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java Tue Mar 28 16:52:39 2006
@@ -13,16 +13,16 @@
/**
- * WebWorkBodyContent
+ * StrutsBodyContent
* User: jcarreira
* Created: Oct 17, 2003 11:18:58 PM
*/
-public class WebWorkBodyContent extends BodyContent {
+public class StrutsBodyContent extends BodyContent {
private StringBuffer buffer = new StringBuffer();
- public WebWorkBodyContent(JspWriter jspWriter) {
+ public StrutsBodyContent(JspWriter jspWriter) {
super(jspWriter);
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java Tue Mar 28 16:52:39 2006
@@ -9,7 +9,7 @@
import org.apache.struts.action2.TestConfigurationProvider;
import org.apache.struts.action2.views.jsp.AbstractUITagTest;
import org.apache.struts.action2.views.jsp.ParamTag;
-import org.apache.struts.action2.views.jsp.WebWorkMockBodyContent;
+import org.apache.struts.action2.views.jsp.StrutsMockBodyContent;
import com.opensymphony.xwork.config.ConfigurationManager;
/**
@@ -300,7 +300,7 @@
ParamTag formParamTag = new ParamTag();
formParamTag.setPageContext(pageContext);
formParamTag.setName("tooltipConfig");
- WebWorkMockBodyContent bodyContent = new WebWorkMockBodyContent(new MockJspWriter());
+ StrutsMockBodyContent bodyContent = new StrutsMockBodyContent(new MockJspWriter());
bodyContent.setString(
"tooltipIcon = /webwork/tooltip/formMyTooltip.gif | " +
"tooltipAboveMousePointer = false | " +
@@ -342,7 +342,7 @@
ParamTag textFieldParamTag = new ParamTag();
textFieldParamTag.setPageContext(pageContext);
textFieldParamTag.setName("tooltipConfig");
- WebWorkMockBodyContent bodyContent2 = new WebWorkMockBodyContent(new MockJspWriter());
+ StrutsMockBodyContent bodyContent2 = new StrutsMockBodyContent(new MockJspWriter());
bodyContent2.setString(
"tooltipIcon = /webwork/tooltip/myTooltip.gif | " +
"tooltipAboveMousePointer = true | " +
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/util/ContextUtilTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/util/ContextUtilTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/util/ContextUtilTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/util/ContextUtilTest.java Tue Mar 28 16:52:39 2006
@@ -5,7 +5,7 @@
package org.apache.struts.action2.views.util;
import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
@@ -22,9 +22,9 @@
stack.getContext().put("useAltSyntax", "true");
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "true");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "true");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
@@ -33,9 +33,9 @@
stack.getContext().put("useAltSyntax", "false");
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "true");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "true");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
@@ -44,9 +44,9 @@
stack.getContext().put("useAltSyntax", "true");
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "false");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "false");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
@@ -55,9 +55,9 @@
stack.getContext().put("useAltSyntax", "false");
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "false");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "false");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertFalse(ContextUtil.isUseAltSyntax(stack.getContext()));
}
@@ -68,9 +68,9 @@
stack.getContext().put("useAltSyntax", Boolean.TRUE);
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "true");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "true");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod6() throws Exception {
@@ -78,9 +78,9 @@
stack.getContext().put("useAltSyntax", Boolean.FALSE);
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "true");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "true");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod7() throws Exception {
@@ -88,9 +88,9 @@
stack.getContext().put("useAltSyntax", Boolean.TRUE);
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "false");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "false");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod8() throws Exception {
@@ -98,9 +98,9 @@
stack.getContext().put("useAltSyntax", Boolean.FALSE);
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, "false");
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
- assertEquals(Configuration.getString(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), "false");
+ assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertFalse(ContextUtil.isUseAltSyntax(stack.getContext()));
}
@@ -110,9 +110,9 @@
stack.getContext().put("useAltSyntax", null);
Configuration.reset();
- Configuration.set(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX, Boolean.TRUE);
+ Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, Boolean.TRUE);
- assertEquals(Configuration.get(WebWorkConstants.WEBWORK_TAG_ALTSYNTAX), Boolean.TRUE);
+ assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), Boolean.TRUE);
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
}
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/util/UrlHelperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/util/UrlHelperTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/util/UrlHelperTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/util/UrlHelperTest.java Tue Mar 28 16:52:39 2006
@@ -5,8 +5,8 @@
package org.apache.struts.action2.views.util;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.WebWorkTestCase;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.struts.action2.config.Configuration;
import javax.servlet.http.HttpServletRequest;
@@ -25,7 +25,7 @@
* @author tm_jee
* @version $Date: 2006/03/08 18:09:28 $ $Id: UrlHelperTest.java,v 1.18 2006/03/08 18:09:28 rainerh Exp $
*/
-public class UrlHelperTest extends WebWorkTestCase {
+public class UrlHelperTest extends StrutsTestCase {
@@ -186,8 +186,8 @@
String expectedString = "https://www.mydomain.com:7002/mywebapp/MyAction.action?foo=bar&hello=earth&hello=mars";
- Configuration.set(WebWorkConstants.WEBWORK_URL_HTTP_PORT, "7001");
- Configuration.set(WebWorkConstants.WEBWORK_URL_HTTPS_PORT, "7002");
+ Configuration.set(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001");
+ Configuration.set(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002");
Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com");
@@ -215,8 +215,8 @@
String expectedString = "http://www.mydomain.com:7001/mywebapp/MyAction.action?foo=bar&hello=earth&hello=mars";
- Configuration.set(WebWorkConstants.WEBWORK_URL_HTTP_PORT, "7001");
- Configuration.set(WebWorkConstants.WEBWORK_URL_HTTPS_PORT, "7002");
+ Configuration.set(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001");
+ Configuration.set(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002");
Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com");
Modified: incubator/webwork2/src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java (original)
+++ incubator/webwork2/src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java Tue Mar 28 16:52:39 2006
@@ -97,7 +97,7 @@
assertTrue(out.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
assertTrue(out.indexOf("<html xmlns=\"http://www.w3.org/TR/xhtml1/strict\"") > -1);
assertTrue(out.indexOf("Hello Santa Claus how are you?") > -1);
- assertTrue(out.indexOf("WebWork in Action by Patrick and Jason") > -1);*/
+ assertTrue(out.indexOf("Struts in Action by Patrick and Jason") > -1);*/
// TODO: There is a bug in XSLTResult and having collections
//assertTrue(out.indexOf("XWork not in Action by Superman") > -1);
}
@@ -149,7 +149,7 @@
public List getBooks() {
List list = new ArrayList();
- list.add(new Book("WebWork in Action", "Patrick and Jason"));
+ list.add(new Book("Struts in Action", "Patrick and Jason"));
list.add(new Book("XWork not in Action", "Superman"));
return list;
}
Copied: incubator/webwork2/src/test/struts.properties (from r389620, incubator/webwork2/src/test/webwork.properties)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/struts.properties?p2=incubator/webwork2/src/test/struts.properties&p1=incubator/webwork2/src/test/webwork.properties&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/webwork.properties (original)
+++ incubator/webwork2/src/test/struts.properties Tue Mar 28 16:52:39 2006
@@ -1,18 +1,18 @@
-webwork.i18n.encoding=ISO-8859-1
-webwork.locale=de_DE
-webwork.multipart.saveDir=\temp
-webwork.multipart.maxSize=12345
+struts.i18n.encoding=ISO-8859-1
+struts.locale=de_DE
+struts.multipart.saveDir=\temp
+struts.multipart.maxSize=12345
-### Load custom property files (does not override webwork.properties!)
-webwork.custom.properties=test,org/apache/struts/action2/othertest
+### Load custom property files (does not override struts.properties!)
+struts.custom.properties=test,org/apache/struts/action2/othertest
# added the MockTag to the path of Tags that the TagDirective will search through
-webwork.velocity.tag.path = org.apache.struts.action2.views.velocity.ui, org.displaytag.tags
+struts.velocity.tag.path = org.apache.struts.action2.views.velocity.ui, org.displaytag.tags
-webwork.ui.templateDir = template
+struts.ui.templateDir = template
### Load custom default resource bundles
-webwork.custom.i18n.resources=testmessages,testmessages2
+struts.custom.i18n.resources=testmessages,testmessages2
### XSLT Cache
-webwork.xslt.nocache = true
+struts.xslt.nocache = true
Modified: incubator/webwork2/src/test/testmessages.properties
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/testmessages.properties?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/test/testmessages.properties (original)
+++ incubator/webwork2/src/test/testmessages.properties Tue Mar 28 16:52:39 2006
@@ -1,2 +1,2 @@
default.testmessage=This is a test message
-webwork.messages.invalid.token=Replaced message for token tag
+struts.messages.invalid.token=Replaced message for token tag
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org