Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java Tue Jul 25 21:33:53 2006 @@ -19,7 +19,7 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsTestCase; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import org.apache.struts2.views.jsp.StrutsMockServletContext; /** @@ -29,7 +29,7 @@ public class FreemarkerManagerTest extends StrutsTestCase { public void testIfStrutsEncodingIsSetProperty() throws Exception { - Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8"); + Settings.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);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java Tue Jul 25 21:33:53 2006 @@ -20,7 +20,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.TestAction; import org.apache.struts2.StrutsTestCase; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import org.apache.struts2.dispatcher.ApplicationMap; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.RequestMap; @@ -118,7 +118,7 @@ ActionContext.setContext(new ActionContext(context)); - Configuration.setConfiguration(null); + Settings.setInstance(null); } protected void tearDown() throws Exception { Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Tue Jul 25 21:33:53 2006 @@ -49,7 +49,7 @@ import org.apache.struts2.dispatcher.Dispatcher; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.OgnlValueStack; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; /** */ @@ -80,7 +80,7 @@ public void setUp() throws Exception { super.setUp(); - Configuration.reset(); + Settings.reset(); Dispatcher.setInstance(new Dispatcher(null)); mockPortletApiAvailable(); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java Tue Jul 25 21:33:53 2006 @@ -22,7 +22,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsTestCase; import org.apache.struts2.StrutsConstants; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.OgnlValueStack; @@ -160,8 +160,8 @@ public void testWithAltSyntax1() throws Exception { // setups - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); Foo foo = new Foo(); foo.setTitle("tm_jee"); @@ -189,8 +189,8 @@ public void testWithAltSyntax2() throws Exception { // setups - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); Foo foo = new Foo(); foo.setTitle("tm_jee"); @@ -218,8 +218,8 @@ public void testWithoutAltSyntax1() throws Exception { // setups - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); - assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); Foo foo = new Foo(); foo.setTitle("tm_jee"); @@ -248,8 +248,8 @@ public void testWithoutAltSyntax2() throws Exception { // setups - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); - assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); Foo foo = new Foo(); foo.setTitle("tm_jee"); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Tue Jul 25 21:33:53 2006 @@ -27,7 +27,7 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.TestAction; import org.apache.struts2.TestConfigurationProvider; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; import org.apache.struts2.views.jsp.AbstractUITagTest; import org.apache.struts2.views.jsp.ActionTag; @@ -308,8 +308,8 @@ */ public void testFormTagWithDifferentActionExtension() throws Exception { request.setupGetServletPath("/testNamespace/testNamespaceAction"); - String oldConfiguration = (String) Configuration.get(StrutsConstants.STRUTS_ACTION_EXTENSION); - Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "jspa"); + String oldConfiguration = (String) Settings.get(StrutsConstants.STRUTS_ACTION_EXTENSION); + Settings.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "jspa"); FormTag tag = new FormTag(); tag.setPageContext(pageContext); @@ -321,12 +321,12 @@ tag.doStartTag(); tag.doEndTag(); - Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, oldConfiguration); + Settings.set(StrutsConstants.STRUTS_ACTION_EXTENSION, oldConfiguration); verify(FormTag.class.getResource("Formtag-5.txt")); // set it back to the default - Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "action"); + Settings.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "action"); } /** @@ -519,8 +519,8 @@ public void testFormWithActionAndExtension() throws Exception { request.setupGetServletPath("/BLA"); - String oldConfiguration = (String) Configuration.get(StrutsConstants.STRUTS_ACTION_EXTENSION); - Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "jspa"); + String oldConfiguration = (String) Settings.get(StrutsConstants.STRUTS_ACTION_EXTENSION); + Settings.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "jspa"); FormTag tag = new FormTag(); tag.setPageContext(pageContext); @@ -530,12 +530,12 @@ tag.doStartTag(); tag.doEndTag(); - Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, oldConfiguration); + Settings.set(StrutsConstants.STRUTS_ACTION_EXTENSION, oldConfiguration); verify(FormTag.class.getResource("Formtag-8.txt")); // set it back to the default - Configuration.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "action"); + Settings.set(StrutsConstants.STRUTS_ACTION_EXTENSION, "action"); } Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java Tue Jul 25 21:33:53 2006 @@ -17,7 +17,7 @@ */ package org.apache.struts2.views.util; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork2.util.OgnlValueStack; import junit.framework.TestCase; @@ -32,10 +32,10 @@ OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", "true"); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } @@ -43,10 +43,10 @@ OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", "false"); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } @@ -54,10 +54,10 @@ OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", "true"); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } @@ -65,10 +65,10 @@ OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", "false"); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); assertFalse(ContextUtil.isUseAltSyntax(stack.getContext())); } @@ -78,40 +78,40 @@ OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", Boolean.TRUE); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } public void testAltSyntaxMethod6() throws Exception { OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", Boolean.FALSE); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } public void testAltSyntaxMethod7() throws Exception { OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", Boolean.TRUE); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } public void testAltSyntaxMethod8() throws Exception { OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", Boolean.FALSE); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false"); - assertEquals(Configuration.getString(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false"); assertFalse(ContextUtil.isUseAltSyntax(stack.getContext())); } @@ -120,10 +120,10 @@ OgnlValueStack stack = new OgnlValueStack(); stack.getContext().put("useAltSyntax", null); - Configuration.reset(); - Configuration.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, Boolean.TRUE); + Settings.reset(); + Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true"); - assertEquals(Configuration.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), Boolean.TRUE); + assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true"); assertTrue(ContextUtil.isUseAltSyntax(stack.getContext())); } } Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java Tue Jul 25 21:33:53 2006 @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.Mock; import org.apache.struts2.StrutsTestCase; import org.apache.struts2.StrutsConstants; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -197,8 +197,8 @@ String expectedString = "https://www.mydomain.com:7002/mywebapp/MyAction.action?foo=bar&hello=earth&hello=mars";; - Configuration.set(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001"); - Configuration.set(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002"); + Settings.set(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001"); + Settings.set(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002"); Mock mockHttpServletRequest = new Mock(HttpServletRequest.class); mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com"); @@ -226,8 +226,8 @@ String expectedString = "http://www.mydomain.com:7001/mywebapp/MyAction.action?foo=bar&hello=earth&hello=mars";; - Configuration.set(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001"); - Configuration.set(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002"); + Settings.set(StrutsConstants.STRUTS_URL_HTTP_PORT, "7001"); + Settings.set(StrutsConstants.STRUTS_URL_HTTPS_PORT, "7002"); Mock mockHttpServletRequest = new Mock(HttpServletRequest.class); mockHttpServletRequest.expectAndReturn("getServerName", "www.mydomain.com"); @@ -282,30 +282,30 @@ } public void testTranslateAndEncode() throws Exception { - Object defaultI18nEncoding = Configuration.get(StrutsConstants.STRUTS_I18N_ENCODING); + String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING); try { - Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8"); + Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8"); String result = UrlHelper.translateAndEncode("\u65b0\u805e"); String expectedResult = "%E6%96%B0%E8%81%9E"; assertEquals(result, expectedResult); } finally { - Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding); + Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding); } } public void testTranslateAndDecode() throws Exception { - Object defaultI18nEncoding = Configuration.get(StrutsConstants.STRUTS_I18N_ENCODING); + String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING); try { - Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8"); + Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8"); String result = UrlHelper.translateAndDecode("%E6%96%B0%E8%81%9E"); String expectedResult = "\u65b0\u805e"; assertEquals(result, expectedResult); } finally { - Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding); + Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding); } } } Modified: struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=425615&r1=425614&r2=425615&view=diff ============================================================================== --- struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java (original) +++ struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java Tue Jul 25 21:33:53 2006 @@ -17,7 +17,7 @@ */ package org.apache.struts2.dispatcher.multipart; -import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.Settings; import org.apache.struts2.StrutsConstants; import http.utils.multipartrequest.ServletMultipartRequest; @@ -121,7 +121,7 @@ String encoding = null; try { - encoding = Configuration.getString(StrutsConstants.STRUTS_I18N_ENCODING); + encoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING); if (encoding != null) { //NB: This should never be called at the same time as the constructor for
