Author: nlebas
Date: Fri Dec 16 00:30:41 2011
New Revision: 1215006
URL: http://svn.apache.org/viewvc?rev=1215006&view=rev
Log:
renamed WebRequest into DispatchRequest
Added:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequest.java
- copied, changed from r1215004,
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
- copied, changed from r1215004,
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DispatchRequestWrapperTest.java
- copied, changed from r1215004,
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
Removed:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
Modified:
tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractRequest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractViewRequest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/AbstractViewRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/DispatchRendererTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
Modified:
tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
Fri Dec 16 00:30:41 2011
@@ -27,7 +27,7 @@ import org.apache.tiles.AttributeContext
import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.preparer.ViewPreparer;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
/**
* Uses a URL that acts as a preparer. When
@@ -58,9 +58,9 @@ public class UrlPreparer implements View
public void execute(Request tilesContext,
AttributeContext attributeContext) {
- if (tilesContext instanceof WebRequest) {
+ if (tilesContext instanceof DispatchRequest) {
try {
- ((WebRequest) tilesContext).include(url);
+ ((DispatchRequest) tilesContext).include(url);
} catch (IOException e) {
throw new PreparerException("The inclusion of the URL " + url
+ " threw an I/O exception", e);
Modified:
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
(original)
+++
tiles/framework/trunk/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
Fri Dec 16 00:30:41 2011
@@ -27,7 +27,7 @@ import java.io.IOException;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.preparer.PreparerException;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.junit.Before;
import org.junit.Test;
@@ -59,7 +59,7 @@ public class UrlPreparerTest {
*/
@Test
public void testExecute() throws IOException {
- WebRequest requestContext = createMock(WebRequest.class);
+ DispatchRequest requestContext = createMock(DispatchRequest.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
requestContext.include("/my/url.do");
@@ -76,7 +76,7 @@ public class UrlPreparerTest {
*/
@Test(expected = PreparerException.class)
public void testExecuteException() throws IOException {
- WebRequest requestContext = createMock(WebRequest.class);
+ DispatchRequest requestContext = createMock(DispatchRequest.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
requestContext.include("/my/url.do");
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractRequest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractRequest.java
Fri Dec 16 00:30:41 2011
@@ -25,7 +25,7 @@ package org.apache.tiles.request;
*
* @version $Rev$ $Date: 2010-11-14 21:32:50 +0100 (dom, 14 nov 2010)$
*/
-public abstract class AbstractRequest implements WebRequest {
+public abstract class AbstractRequest implements DispatchRequest {
/**
* Name of the attribute used to store the force-include option.
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractViewRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractViewRequest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractViewRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractViewRequest.java
Fri Dec 16 00:30:41 2011
@@ -22,7 +22,7 @@ package org.apache.tiles.request;
import java.io.IOException;
-import org.apache.tiles.request.util.WebRequestWrapper;
+import org.apache.tiles.request.util.DispatchRequestWrapper;
/**
* Base class for "view" requests, i.e. requests created into view
technologies,
@@ -31,14 +31,14 @@ import org.apache.tiles.request.util.Web
*
* @version $Rev$ $Date$
*/
-public class AbstractViewRequest extends WebRequestWrapper {
+public class AbstractViewRequest extends DispatchRequestWrapper {
/**
* Constructor.
*
* @param request The base request.
*/
- public AbstractViewRequest(WebRequest request) {
+ public AbstractViewRequest(DispatchRequest request) {
super(request);
}
Copied:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequest.java
(from r1215004,
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequest.java&p1=tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java&r1=1215004&r2=1215006&rev=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequest.java
Fri Dec 16 00:30:41 2011
@@ -29,7 +29,7 @@ import java.io.IOException;
* @since 2.0
* @version $Rev$ $Date$
*/
-public interface WebRequest extends Request {
+public interface DispatchRequest extends Request {
/**
* Dispatches the request to a specified path.
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java
Fri Dec 16 00:30:41 2011
@@ -23,7 +23,7 @@ package org.apache.tiles.request.render;
import java.io.IOException;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
/**
* Renders an attribute that contains a reference to a template.
@@ -39,11 +39,11 @@ public class DispatchRenderer implements
if (path == null) {
throw new CannotRenderException("Cannot dispatch a null path");
}
- if (!(request instanceof WebRequest)) {
+ if (!(request instanceof DispatchRequest)) {
throw new CannotRenderException("Cannot dispatch outside of a web
environment");
}
- ((WebRequest) request).dispatch(path);
+ ((DispatchRequest) request).dispatch(path);
}
/** {@inheritDoc} */
Copied:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
(from r1215004,
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java?p2=tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java&p1=tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java&r1=1215004&r2=1215006&rev=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/DispatchRequestWrapper.java
Fri Dec 16 00:30:41 2011
@@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.tiles.request.AbstractRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.scope.ContextResolver;
/**
@@ -38,25 +38,25 @@ import org.apache.tiles.request.scope.Co
* @since Tiles 2.0
* @version $Rev$ $Date$
*/
-public class WebRequestWrapper extends AbstractRequest implements
+public class DispatchRequestWrapper extends AbstractRequest implements
RequestWrapper {
/**
* The wrapper request context object.
*/
- private WebRequest context;
+ private DispatchRequest context;
/**
* Constructor.
*
* @param context The request context to wrap.
*/
- public WebRequestWrapper(WebRequest context) {
+ public DispatchRequestWrapper(DispatchRequest context) {
this.context = context;
}
/** {@inheritDoc} */
- public WebRequest getWrappedRequest() {
+ public DispatchRequest getWrappedRequest() {
return context;
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/AbstractViewRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/AbstractViewRequestTest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/AbstractViewRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/AbstractViewRequestTest.java
Fri Dec 16 00:30:41 2011
@@ -47,7 +47,7 @@ public class AbstractViewRequestTest {
/**
* The internal request.
*/
- private WebRequest wrappedRequest;
+ private DispatchRequest wrappedRequest;
/**
* The application context.
@@ -69,7 +69,7 @@ public class AbstractViewRequestTest {
*/
@Before
public void setUp() {
- wrappedRequest = createMock(WebRequest.class);
+ wrappedRequest = createMock(DispatchRequest.class);
request = createMockBuilder(AbstractViewRequest.class).withConstructor(
wrappedRequest).createMock();
applicationContext = createMock(ApplicationContext.class);
Modified:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/DispatchRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/DispatchRendererTest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/DispatchRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/render/DispatchRendererTest.java
Fri Dec 16 00:30:41 2011
@@ -26,7 +26,7 @@ import static org.junit.Assert.*;
import java.io.IOException;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.junit.Before;
import org.junit.Test;
@@ -50,13 +50,13 @@ public class DispatchRendererTest {
/**
* Tests
- * {@link DispatchRenderer#render(String, WebRequest)}.
+ * {@link DispatchRenderer#render(String, DispatchRequest)}.
*
* @throws IOException If something goes wrong during rendition.
*/
@Test
public void testWrite() throws IOException {
- WebRequest requestContext = createMock(WebRequest.class);
+ DispatchRequest requestContext = createMock(DispatchRequest.class);
requestContext.dispatch("/myTemplate.jsp");
replay(requestContext);
renderer.render("/myTemplate.jsp", requestContext);
@@ -65,13 +65,13 @@ public class DispatchRendererTest {
/**
* Tests
- * {@link DispatchRenderer#render(String, WebRequest)}.
+ * {@link DispatchRenderer#render(String, DispatchRequest)}.
*
* @throws IOException If something goes wrong during rendition.
*/
@Test(expected = CannotRenderException.class)
public void testWriteNull() throws IOException {
- WebRequest requestContext = createMock(WebRequest.class);
+ DispatchRequest requestContext = createMock(DispatchRequest.class);
replay(requestContext);
renderer.render(null, requestContext);
verify(requestContext);
@@ -79,11 +79,11 @@ public class DispatchRendererTest {
/**
* Tests
- * {@link DispatchRenderer#isRenderable(String, WebRequest)}.
+ * {@link DispatchRenderer#isRenderable(String, DispatchRequest)}.
*/
@Test
public void testIsRenderable() {
- Request requestContext = createMock(WebRequest.class);
+ Request requestContext = createMock(DispatchRequest.class);
replay(requestContext);
assertTrue(renderer.isRenderable("/myTemplate.jsp", requestContext));
assertFalse(renderer.isRenderable(null, requestContext));
Copied:
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DispatchRequestWrapperTest.java
(from r1215004,
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DispatchRequestWrapperTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DispatchRequestWrapperTest.java&p1=tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java&r1=1215004&r2=1215006&rev=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/util/DispatchRequestWrapperTest.java
Fri Dec 16 00:30:41 2011
@@ -27,71 +27,71 @@ import static org.easymock.classextensio
import java.io.IOException;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.junit.Test;
/**
- * Tests {@link WebRequestWrapper}.
+ * Tests {@link DispatchRequestWrapper}.
*
* @version $Rev$ $Date$
*/
-public class WebRequestWrapperTest extends DefaultRequestWrapperTest {
+public class DispatchRequestWrapperTest extends DefaultRequestWrapperTest {
@Override
- protected WebRequest createMockRequest() {
- WebRequest wrappedRequest = createMock(WebRequest.class);
+ protected DispatchRequest createMockRequest() {
+ DispatchRequest wrappedRequest = createMock(DispatchRequest.class);
return wrappedRequest;
}
@Override
- protected WebRequestWrapper createRequestWrapper(Request wrappedRequest) {
- WebRequestWrapper request = new WebRequestWrapper((WebRequest)
wrappedRequest);
+ protected DispatchRequestWrapper createRequestWrapper(Request
wrappedRequest) {
+ DispatchRequestWrapper request = new
DispatchRequestWrapper((DispatchRequest) wrappedRequest);
return request;
}
/**
- * Test method for {@link
org.apache.tiles.request.util.WebRequestWrapper#dispatch(java.lang.String)}.
+ * Test method for {@link
org.apache.tiles.request.util.DispatchRequestWrapper#dispatch(java.lang.String)}.
* @throws IOException If something goes wrong.
*/
@Test
public void testDispatch() throws IOException {
- WebRequest wrappedRequest = createMockRequest();
+ DispatchRequest wrappedRequest = createMockRequest();
wrappedRequest.dispatch("/my/path.html");
replay(wrappedRequest);
- WebRequestWrapper request = createRequestWrapper(wrappedRequest);
+ DispatchRequestWrapper request = createRequestWrapper(wrappedRequest);
request.dispatch("/my/path.html");
verify(wrappedRequest);
}
/**
- * Test method for {@link
org.apache.tiles.request.util.WebRequestWrapper#include(java.lang.String)}.
+ * Test method for {@link
org.apache.tiles.request.util.DispatchRequestWrapper#include(java.lang.String)}.
* @throws IOException If something goes wrong.
*/
@Test
public void testInclude() throws IOException {
- WebRequest wrappedRequest = createMockRequest();
+ DispatchRequest wrappedRequest = createMockRequest();
wrappedRequest.include("/my/path.html");
replay(wrappedRequest);
- WebRequestWrapper request = createRequestWrapper(wrappedRequest);
+ DispatchRequestWrapper request = createRequestWrapper(wrappedRequest);
request.include("/my/path.html");
verify(wrappedRequest);
}
/**
- * Test method for {@link
org.apache.tiles.request.util.WebRequestWrapper#setContentType(java.lang.String)}.
+ * Test method for {@link
org.apache.tiles.request.util.DispatchRequestWrapper#setContentType(java.lang.String)}.
*/
@Test
public void testSetContentType() {
- WebRequest wrappedRequest = createMockRequest();
+ DispatchRequest wrappedRequest = createMockRequest();
wrappedRequest.setContentType("text/html");
replay(wrappedRequest);
- WebRequestWrapper request = createRequestWrapper(wrappedRequest);
+ DispatchRequestWrapper request = createRequestWrapper(wrappedRequest);
request.setContentType("text/html");
verify(wrappedRequest);
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
Fri Dec 16 00:30:41 2011
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.AbstractViewRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.servlet.ServletRequest;
import freemarker.core.Environment;
@@ -73,7 +73,7 @@ public class FreemarkerRequest extends A
.getRequestHashModel(env);
HttpServletRequest request = requestModel.getRequest();
HttpServletResponse response = requestModel.getResponse();
- WebRequest enclosedRequest = new ServletRequest(
+ DispatchRequest enclosedRequest = new ServletRequest(
applicationContext, request, response);
return new FreemarkerRequest(enclosedRequest, env);
}
@@ -86,7 +86,7 @@ public class FreemarkerRequest extends A
* @param env
* The FreeMarker environment.
*/
- public FreemarkerRequest(WebRequest enclosedRequest,
+ public FreemarkerRequest(DispatchRequest enclosedRequest,
Environment env) {
super(enclosedRequest);
this.env = env;
Modified:
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
Fri Dec 16 00:30:41 2011
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.scope.ContextResolver;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.request.util.ApplicationAccess;
@@ -133,7 +133,7 @@ public class FreemarkerRequestTest {
@Test
public void testDispatch() throws IOException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
ApplicationContext applicationContext =
createMock(ApplicationContext.class);
ContextResolver resolver = createMock(ContextResolver.class);
Map<String, Object> applicationScope = new HashMap<String, Object>();
@@ -156,7 +156,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetPageScope() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
assertTrue(context.getPageScope() instanceof EnvironmentScopeMap);
@@ -168,7 +168,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetNativeScopes() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
assertArrayEquals(new String[] {"page"}, context.getNativeScopes());
@@ -180,7 +180,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetRequestLocale() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
assertEquals(locale, context.getRequestLocale());
@@ -192,7 +192,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetRequest() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
assertEquals(env, context.getEnvironment());
@@ -204,7 +204,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetResponse() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
assertEquals(env, context.getEnvironment());
@@ -216,7 +216,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetPrintWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
@@ -238,7 +238,7 @@ public class FreemarkerRequestTest {
Environment env = new Environment(template, model, writer);
Locale locale = Locale.ITALY;
env.setLocale(locale);
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
@@ -252,7 +252,7 @@ public class FreemarkerRequestTest {
*/
@Test
public void testGetWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new FreemarkerRequest(enclosedRequest, env);
Modified:
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
Fri Dec 16 00:30:41 2011
@@ -32,7 +32,7 @@ import javax.servlet.jsp.PageContext;
import org.apache.tiles.request.AbstractViewRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.collection.ScopeMap;
import org.apache.tiles.request.jsp.extractor.ScopeExtractor;
import org.apache.tiles.request.jsp.extractor.SessionScopeExtractor;
@@ -101,7 +101,7 @@ public class JspRequest extends Abstract
* @param enclosedRequest The request that is wrapped here.
* @param pageContext The page context to use.
*/
- public JspRequest(WebRequest enclosedRequest,
+ public JspRequest(DispatchRequest enclosedRequest,
PageContext pageContext) {
super(enclosedRequest);
this.pageContext = pageContext;
Modified:
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
Fri Dec 16 00:30:41 2011
@@ -33,7 +33,7 @@ import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.collection.ScopeMap;
import org.apache.tiles.request.servlet.ServletRequest;
import org.junit.Before;
@@ -49,7 +49,7 @@ public class JspRequestTest {
/**
* The enclosed request.
*/
- private WebRequest enclosedRequest;
+ private DispatchRequest enclosedRequest;
/**
* The page context.
@@ -66,7 +66,7 @@ public class JspRequestTest {
*/
@Before
public void setUp() {
- enclosedRequest = createMock(WebRequest.class);
+ enclosedRequest = createMock(DispatchRequest.class);
context = createMock(PageContext.class);
request = new JspRequest(enclosedRequest, context);
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
Fri Dec 16 00:30:41 2011
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.util.ApplicationAccess;
-import org.apache.tiles.request.util.WebRequestWrapper;
+import org.apache.tiles.request.util.DispatchRequestWrapper;
/**
* Utilities for Tiles request servlet support.
@@ -100,10 +100,10 @@ public final class ServletUtil {
if (currentRequest instanceof ServletRequest) {
return (ServletRequest) currentRequest;
}
- if (!(currentRequest instanceof WebRequestWrapper)) {
+ if (!(currentRequest instanceof DispatchRequestWrapper)) {
throw new NotAServletEnvironmentException("Not a Servlet
environment, not supported");
}
- currentRequest = ((WebRequestWrapper)
currentRequest).getWrappedRequest();
+ currentRequest = ((DispatchRequestWrapper)
currentRequest).getWrappedRequest();
}
}
Modified:
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
Fri Dec 16 00:30:41 2011
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.AbstractViewRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.request.servlet.ServletUtil;
@@ -80,7 +80,7 @@ public class VelocityRequest extends Abs
public static VelocityRequest createVelocityRequest(
ApplicationContext applicationContext, HttpServletRequest request,
HttpServletResponse response, Context velocityContext, Writer
writer) {
- WebRequest servletRequest = new ServletRequest(
+ DispatchRequest servletRequest = new ServletRequest(
applicationContext, request, response);
VelocityRequest velocityRequest = new VelocityRequest(
servletRequest, velocityContext, writer);
@@ -96,7 +96,7 @@ public class VelocityRequest extends Abs
* @since 2.2.0
*/
public VelocityRequest(
- WebRequest enclosedRequest, Context ctx, Writer writer) {
+ DispatchRequest enclosedRequest, Context ctx, Writer writer) {
super(enclosedRequest);
this.ctx = ctx;
this.writer = writer;
Modified:
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java?rev=1215006&r1=1215005&r2=1215006&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
(original)
+++
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
Fri Dec 16 00:30:41 2011
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.WebRequest;
+import org.apache.tiles.request.DispatchRequest;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.velocity.context.Context;
@@ -95,7 +95,7 @@ public class VelocityRequestTest {
*/
@Test
public void testGetNativeScopes() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
assertArrayEquals(new String[] {"page"}, context.getNativeScopes());
@@ -186,7 +186,7 @@ public class VelocityRequestTest {
*/
@Test
public void testGetPrintWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
@@ -199,7 +199,7 @@ public class VelocityRequestTest {
*/
@Test
public void testGetPrintWriterPrintWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
PrintWriter printWriter = new PrintWriter(writer);
replay(velocityContext, enclosedRequest);
@@ -213,7 +213,7 @@ public class VelocityRequestTest {
*/
@Test(expected = IllegalStateException.class)
public void testGetPrintWriterNoWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext, null);
@@ -226,7 +226,7 @@ public class VelocityRequestTest {
*/
@Test
public void testGetWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
@@ -239,7 +239,7 @@ public class VelocityRequestTest {
*/
@Test(expected = IllegalStateException.class)
public void testGetWriterNoWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext, null);
@@ -252,7 +252,7 @@ public class VelocityRequestTest {
*/
@Test
public void testGetPageScope() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext,
writer);
