Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java?rev=421742&r1=421741&r2=421742&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java Thu Jul 13 16:48:46 2006 @@ -18,7 +18,7 @@ package org.apache.struts2.validators; import org.apache.struts2.dispatcher.ApplicationMap; -import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.RequestMap; import org.apache.struts2.dispatcher.SessionMap; import com.opensymphony.xwork2.*; @@ -69,7 +69,7 @@ Map requestMap = new RequestMap(req); Map session = new SessionMap(req); Map application = new ApplicationMap(servletContext); - DispatcherUtils du = DispatcherUtils.getInstance(); + Dispatcher du = Dispatcher.getInstance(); HashMap ctx = du.createContextMap(requestMap, params, session,
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?rev=421742&r1=421741&r2=421742&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java Thu Jul 13 16:48:46 2006 @@ -20,7 +20,7 @@ import org.apache.struts2.RequestUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.ApplicationMap; -import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.RequestMap; import org.apache.struts2.dispatcher.SessionMap; import org.apache.struts2.dispatcher.mapper.ActionMapper; @@ -49,7 +49,7 @@ stack = new OgnlValueStack(); HttpServletResponse res = (HttpServletResponse) pageContext.getResponse(); - DispatcherUtils du = DispatcherUtils.getInstance(); + Dispatcher du = Dispatcher.getInstance(); Map extraContext = du.createContextMap(new RequestMap(req), req.getParameterMap(), new SessionMap(req), Copied: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java (from r421711, struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java) URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java?p2=struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java&r1=421711&r2=421742&rev=421742&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java Thu Jul 13 16:48:46 2006 @@ -24,10 +24,10 @@ import com.opensymphony.xwork2.util.LocalizedTextUtil; /** - * Test case for DispatcherUtils. + * Test case for Dispatcher. * */ -public class DispatcherUtilsTest extends StrutsTestCase { +public class DispatcherTest extends StrutsTestCase { public void testDefaultResurceBundlePropertyLoaded() throws Exception { Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=421742&r1=421741&r2=421742&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java Thu Jul 13 16:48:46 2006 @@ -42,7 +42,7 @@ import org.jmock.cglib.MockObjectTestCase; import org.jmock.core.Constraint; -import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.context.ServletContextHolderListener; import com.opensymphony.xwork2.Action; Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java?rev=421742&r1=421741&r2=421742&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java Thu Jul 13 16:48:46 2006 @@ -21,7 +21,7 @@ import com.opensymphony.xwork2.config.ConfigurationManager; import org.apache.struts2.StrutsTestCase; -import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.Dispatcher; import java.io.File; import java.io.InputStream; @@ -32,7 +32,7 @@ */ public class SiteGraphTest extends StrutsTestCase { public void testWebFlow() throws Exception { - DispatcherUtils.getInstance().getConfigurationManager().clearConfigurationProviders(); + Dispatcher.getInstance().getConfigurationManager().clearConfigurationProviders(); // use the classloader rather than relying on the // working directory being an assumed value when // running the test: so let's get this class's parent dir 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=421742&r1=421741&r2=421742&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 Thu Jul 13 16:48:46 2006 @@ -22,7 +22,7 @@ import org.apache.struts2.StrutsTestCase; import org.apache.struts2.config.Configuration; import org.apache.struts2.dispatcher.ApplicationMap; -import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.RequestMap; import org.apache.struts2.dispatcher.SessionMap; import com.opensymphony.xwork2.Action; @@ -96,7 +96,7 @@ pageContext.setJspWriter(jspWriter); pageContext.setServletContext(servletContext); - DispatcherUtils du = new DispatcherUtils(pageContext.getServletContext()); + Dispatcher du = new Dispatcher(pageContext.getServletContext()); du.setInstance(du); du.setConfigurationManager(configurationManager); session = new SessionMap(request); @@ -107,7 +107,7 @@ request, response, pageContext.getServletContext()); - // let's not set the locale -- there is a test that checks if DispatcherUtils actually picks this up... + // let's not set the locale -- there is a test that checks if Dispatcher actually picks this up... // ... but generally we want to just use no locale (let it stay system default) extraContext.remove(ActionContext.LOCALE); stack.getContext().putAll(extraContext); 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=421742&r1=421741&r2=421742&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 Thu Jul 13 16:48:46 2006 @@ -46,7 +46,7 @@ import org.apache.struts2.portlet.PortletActionConstants; import org.apache.struts2.portlet.util.PortletUrlHelper; import org.apache.struts2.views.jsp.ParamTag; -import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.Dispatcher; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.OgnlValueStack; import org.apache.struts2.config.Configuration; @@ -81,7 +81,7 @@ super.setUp(); Configuration.reset(); - DispatcherUtils.setInstance(new DispatcherUtils(null)); + Dispatcher.setInstance(new Dispatcher(null)); mockPortletApiAvailable(); @@ -139,7 +139,7 @@ */ private void mockPortletApiAvailable() { try { - Field field = DispatcherUtils.class.getDeclaredField("portletSupportActive"); + Field field = Dispatcher.class.getDeclaredField("portletSupportActive"); field.setAccessible(true); field.set(null, Boolean.TRUE); }
