Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java Sun Nov 8 12:16:06 2009 @@ -21,9 +21,27 @@ package org.apache.tiles.freemarker.context; -import static org.junit.Assert.*; -import static org.easymock.classextension.EasyMock.*; -import static org.apache.tiles.freemarker.context.FreeMarkerUtil.*; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.evaluateBody; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.getComposeStack; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.getContainer; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.getCurrentContainer; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.getRequestHashModel; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.getServletContextHashModel; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.isForceInclude; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.renderAsString; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.setAttribute; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.setCurrentContainer; +import static org.apache.tiles.freemarker.context.FreeMarkerUtil.setForceInclude; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; +import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.classextension.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.io.StringWriter; @@ -114,7 +132,10 @@ HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper); expect(model.get("Request")).andReturn(requestModel); - expect(request.getAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME)).andReturn(true); + expect( + request + .getAttribute(org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME)) + .andReturn(true); replay(template, model, request, objectWrapper); env = new Environment(template, model, writer); @@ -136,7 +157,10 @@ HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper); expect(model.get("Request")).andReturn(requestModel); - request.setAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, true); + request + .setAttribute( + org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, + true); replay(template, model, request, objectWrapper); env = new Environment(template, model, writer);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java Sun Nov 8 12:16:06 2009 @@ -124,7 +124,10 @@ expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null).times(2); request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expectLastCall().times(2); - request.setAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, true); + request + .setAttribute( + org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, + true); replay(request); HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper); Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java Sun Nov 8 12:16:06 2009 @@ -27,9 +27,9 @@ import javax.servlet.ServletException; import javax.servlet.jsp.PageContext; -import org.apache.tiles.context.TilesRequestContextWrapper; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.servlet.ServletUtil; +import org.apache.tiles.request.util.TilesRequestContextWrapper; /** * Context implementation used for executing tiles within a @@ -67,7 +67,7 @@ * * @param path The path to dispatch to. * @throws IOException If something goes wrong during dispatching. - * @see org.apache.tiles.servlet.context.ServletTilesRequestContext#dispatch(java.lang.String) + * @see org.apache.tiles.request.servlet.ServletTilesRequestContext#dispatch(java.lang.String) */ @Override public void dispatch(String path) throws IOException { Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java Sun Nov 8 12:16:06 2009 @@ -28,10 +28,10 @@ import javax.servlet.jsp.PageContext; import org.apache.tiles.awareness.TilesRequestContextFactoryAware; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ServletTilesRequestContext; +import org.apache.tiles.request.TilesRequestContextFactory; +import org.apache.tiles.request.servlet.ServletTilesRequestContext; /** * Creates an instance of the appropriate {...@link Request} Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java Sun Nov 8 12:16:06 2009 @@ -79,9 +79,10 @@ * @since 2.0.6 */ public static boolean isForceInclude(JspContext context) { - Boolean retValue = (Boolean) context.getAttribute( - ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, - PageContext.REQUEST_SCOPE); + Boolean retValue = (Boolean) context + .getAttribute( + org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, + PageContext.REQUEST_SCOPE); return retValue != null && retValue.booleanValue(); } @@ -95,9 +96,10 @@ */ public static void setForceInclude(JspContext context, boolean forceInclude) { Boolean retValue = Boolean.valueOf(forceInclude); - context.setAttribute( - ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, - retValue, PageContext.REQUEST_SCOPE); + context + .setAttribute( + org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, + retValue, PageContext.REQUEST_SCOPE); } /** Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java Sun Nov 8 12:16:06 2009 @@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ServletTilesRequestContext; +import org.apache.tiles.request.TilesRequestContextFactory; +import org.apache.tiles.request.servlet.ServletTilesRequestContext; import org.easymock.classextension.EasyMock; import junit.framework.TestCase; Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import javax.portlet.PortletContext; -import org.apache.tiles.context.MapEntry; +import org.apache.tiles.request.util.MapEntry; /** Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import javax.portlet.PortletContext; -import org.apache.tiles.context.MapEntry; +import org.apache.tiles.request.util.MapEntry; /** * <p>Private implementation of <code>Map</code> for portlet context Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import javax.portlet.PortletRequest; -import org.apache.tiles.context.MapEntry; +import org.apache.tiles.request.util.MapEntry; /** * <p>Private implementation of <code>Map</code> for portlet parameter Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import javax.portlet.PortletRequest; -import org.apache.tiles.context.MapEntry; +import org.apache.tiles.request.util.MapEntry; /** Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import javax.portlet.PortletRequest; -import org.apache.tiles.context.MapEntry; +import org.apache.tiles.request.util.MapEntry; /** * <p>Private implementation of <code>Map</code> for portlet request Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import javax.portlet.PortletSession; -import org.apache.tiles.context.MapEntry; +import org.apache.tiles.request.util.MapEntry; /** * <p>Private implementation of <code>Map</code> for portlet session Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java Sun Nov 8 12:16:06 2009 @@ -36,9 +36,9 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import org.apache.tiles.context.TilesApplicationContextWrapper; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; +import org.apache.tiles.request.util.TilesApplicationContextWrapper; /** * Portlet-based TilesApplicationContext implementation. Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java Sun Nov 8 12:16:06 2009 @@ -25,9 +25,9 @@ import javax.portlet.PortletRequest; import javax.portlet.PortletResponse; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; +import org.apache.tiles.request.TilesRequestContextFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletUtil.java Sun Nov 8 12:16:06 2009 @@ -55,8 +55,8 @@ * @since 2.0.6 */ public static boolean isForceInclude(PortletRequest request) { - Boolean retValue = (Boolean) request - .getAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME); + Boolean retValue = (Boolean) request + .getAttribute(org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME); return retValue != null && retValue.booleanValue(); } @@ -71,9 +71,10 @@ public static void setForceInclude(PortletRequest request, boolean forceInclude) { Boolean retValue = Boolean.valueOf(forceInclude); - request.setAttribute( - ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, - retValue); + request + .setAttribute( + org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, + retValue); } /** Modified: tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/wildcard/WildcardServletTilesApplicationContext.java Sun Nov 8 12:16:06 2009 @@ -28,7 +28,7 @@ import javax.servlet.ServletContext; -import org.apache.tiles.servlet.context.ServletTilesApplicationContext; +import org.apache.tiles.request.servlet.ServletTilesApplicationContext; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.web.context.support.ServletContextResourcePatternResolver; Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/pom.xml URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/pom.xml?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/pom.xml (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/pom.xml Sun Nov 8 12:16:06 2009 @@ -139,6 +139,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-request-servlet</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> </dependencies> </project> Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java Sun Nov 8 12:16:06 2009 @@ -21,20 +21,21 @@ package org.apache.tiles.servlet.context; -import java.io.IOException; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import org.apache.tiles.ArrayStack; import org.apache.tiles.TilesContainer; import org.apache.tiles.access.TilesAccess; -import org.apache.tiles.context.TilesRequestContextWrapper; import org.apache.tiles.impl.NoSuchContainerException; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; +import org.apache.tiles.request.servlet.NotAServletEnvironmentException; +import org.apache.tiles.request.servlet.ServletTilesApplicationContext; +import org.apache.tiles.request.servlet.ServletTilesRequestContext; +import org.apache.tiles.request.util.TilesRequestContextWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,13 +54,6 @@ public static final String COMPOSE_STACK_ATTRIBUTE_NAME = "org.apache.tiles.template.COMPOSE_STACK"; /** - * Name of the attribute used to store the force-include option. - * @since 2.0.6 - */ - public static final String FORCE_INCLUDE_ATTRIBUTE_NAME = - "org.apache.tiles.servlet.context.ServletTilesRequestContext.FORCE_INCLUDE"; - - /** * Name of the attribute used to store the current used container. */ public static final String CURRENT_CONTAINER_ATTRIBUTE_NAME = @@ -72,35 +66,6 @@ } /** - * Returns true if forced include of the result is needed. - * - * @param request The HTTP request. - * @return If <code>true</code> the include operation must be forced. - * @since 2.0.6 - */ - public static boolean isForceInclude(HttpServletRequest request) { - Boolean retValue = (Boolean) request - .getAttribute(ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME); - return retValue != null && retValue.booleanValue(); - } - - /** - * Sets the option that enables the forced include of the response. - * - * @param request The HTTP request. - * @param forceInclude If <code>true</code> the include operation must be - * forced. - * @since 2.0.6 - */ - public static void setForceInclude(HttpServletRequest request, - boolean forceInclude) { - Boolean retValue = Boolean.valueOf(forceInclude); - request.setAttribute( - ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME, - retValue); - } - - /** * Returns the default Tiles container. * * @param context The servlet context to use. @@ -223,29 +188,6 @@ } /** - * Wraps a ServletException to create an IOException with the root cause if present. - * - * @param ex The exception to wrap. - * @param message The message of the exception. - * @return The wrapped exception. - * @since 2.1.1 - */ - public static IOException wrapServletException(ServletException ex, - String message) { - IOException retValue; - Throwable rootCause = ex.getRootCause(); - if (rootCause != null) { - // Replace the ServletException with an IOException, with the root - // cause of the first as the cause of the latter. - retValue = new IOException(message, rootCause); - } else { - retValue = new IOException(message, ex); - } - - return retValue; - } - - /** * Returns the compose stack, that is used by the tags to compose * definitions, attributes, etc. * Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java Sun Nov 8 12:16:06 2009 @@ -24,7 +24,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; -import org.apache.tiles.servlet.context.ServletTilesApplicationContext; +import org.apache.tiles.request.servlet.ServletTilesApplicationContext; import org.apache.tiles.startup.TilesInitializer; import org.apache.tiles.web.util.ServletContextAdapter; Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java Sun Nov 8 12:16:06 2009 @@ -25,7 +25,7 @@ import javax.servlet.ServletContextListener; import org.apache.tiles.TilesException; -import org.apache.tiles.servlet.context.ServletTilesApplicationContext; +import org.apache.tiles.request.servlet.ServletTilesApplicationContext; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.startup.TilesInitializer; import org.slf4j.Logger; Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java Sun Nov 8 12:16:06 2009 @@ -26,12 +26,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.definition.DefinitionsFactoryException; import org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO; import org.apache.tiles.definition.dao.CachingLocaleUrlDefinitionDAO; import org.apache.tiles.locale.LocaleResolver; import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.TilesRequestContextFactory; import org.apache.tiles.test.factory.TestTilesContainerFactory; /** Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java Sun Nov 8 12:16:06 2009 @@ -26,12 +26,12 @@ import java.util.Set; import org.apache.tiles.TilesContainer; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.definition.DefinitionsFactoryException; import org.apache.tiles.evaluator.AttributeEvaluatorFactory; import org.apache.tiles.extras.complete.CompleteAutoloadTilesContainerFactory; import org.apache.tiles.renderer.impl.BasicRendererFactory; import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.TilesRequestContextFactory; import org.apache.tiles.test.renderer.ReverseStringAttributeRenderer; import org.apache.tiles.util.URLUtil; Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java Sun Nov 8 12:16:06 2009 @@ -27,13 +27,13 @@ import javax.sql.DataSource; import org.apache.tiles.context.ChainedTilesRequestContextFactory; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.definition.LocaleDefinitionsFactory; import org.apache.tiles.definition.dao.DefinitionDAO; import org.apache.tiles.factory.BasicTilesContainerFactory; import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory; import org.apache.tiles.locale.LocaleResolver; import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.TilesRequestContextFactory; import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory; Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java Sun Nov 8 12:16:06 2009 @@ -23,8 +23,8 @@ import javax.servlet.ServletContext; -import org.apache.tiles.TilesApplicationContext; import org.apache.tiles.factory.AbstractTilesContainerFactory; +import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext; import org.apache.tiles.startup.AbstractTilesInitializer; import org.apache.tiles.test.factory.TestTilesContainerFactory; @@ -39,14 +39,14 @@ /** {...@inheritdoc} */ @Override protected AbstractTilesContainerFactory createContainerFactory( - TilesApplicationContext context) { + ApplicationContext context) { return new TestTilesContainerFactory(); } /** {...@inheritdoc} */ @Override - protected TilesApplicationContext createTilesApplicationContext( - TilesApplicationContext preliminaryContext) { + protected ApplicationContext createTilesApplicationContext( + ApplicationContext preliminaryContext) { return new WildcardServletTilesApplicationContext( (ServletContext) preliminaryContext.getContext()); } Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java Sun Nov 8 12:16:06 2009 @@ -20,10 +20,10 @@ */ package org.apache.tiles.test.preparer; -import org.apache.tiles.preparer.ViewPreparer; -import org.apache.tiles.context.TilesRequestContext; -import org.apache.tiles.AttributeContext; import org.apache.tiles.Attribute; +import org.apache.tiles.AttributeContext; +import org.apache.tiles.preparer.ViewPreparer; +import org.apache.tiles.request.Request; /** * A <code>ViewPreparer</code> that stores an attribute. @@ -33,7 +33,7 @@ public class AttributeViewPreparer implements ViewPreparer { /** {...@inheritdoc} */ - public void execute(TilesRequestContext tilesContext, + public void execute(Request tilesContext, AttributeContext attributeContext) { attributeContext.putAttribute( "body", Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java Sun Nov 8 12:16:06 2009 @@ -22,9 +22,9 @@ import java.util.Map; -import org.apache.tiles.preparer.ViewPreparer; -import org.apache.tiles.context.TilesRequestContext; import org.apache.tiles.AttributeContext; +import org.apache.tiles.preparer.ViewPreparer; +import org.apache.tiles.request.Request; /** * A simple test <code>ViewPreparer</code> to put a request attribute, that @@ -35,7 +35,7 @@ public class RequestSettingViewPreparer implements ViewPreparer { /** {...@inheritdoc} */ - public void execute(TilesRequestContext tilesContext, + public void execute(Request tilesContext, AttributeContext attributeContext) { Map<String, Object> requestScope = tilesContext.getRequestScope(); requestScope.put("body", "test.inner.definition"); Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java Sun Nov 8 12:16:06 2009 @@ -20,10 +20,10 @@ */ package org.apache.tiles.test.preparer; -import org.apache.tiles.preparer.ViewPreparer; -import org.apache.tiles.context.TilesRequestContext; -import org.apache.tiles.AttributeContext; import org.apache.tiles.Attribute; +import org.apache.tiles.AttributeContext; +import org.apache.tiles.preparer.ViewPreparer; +import org.apache.tiles.request.Request; /** * A simple test <code>ViewPreparer</code>. @@ -33,7 +33,7 @@ public class TestViewPreparer implements ViewPreparer { /** {...@inheritdoc} */ - public void execute(TilesRequestContext tilesContext, + public void execute(Request tilesContext, AttributeContext attributeContext) { attributeContext.putAttribute( "body", Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java Sun Nov 8 12:16:06 2009 @@ -28,8 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.servlet.context.ServletUtil; - /** * Sample servlet that includes a page specified by the <code>include</code> * init parameter. @@ -76,7 +74,7 @@ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - if (ServletUtil.isForceInclude(request)) { + if (org.apache.tiles.request.servlet.ServletUtil.isForceInclude(request)) { request.getRequestDispatcher(include).include(request, response); } else { request.getRequestDispatcher(errorInclude).include(request, response); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java Sun Nov 8 12:16:06 2009 @@ -30,10 +30,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.context.TilesRequestContextWrapper; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ExternalWriterHttpServletResponse; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.servlet.ServletUtil; +import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse; +import org.apache.tiles.request.util.TilesRequestContextWrapper; import org.apache.velocity.context.Context; /** Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java Sun Nov 8 12:16:06 2009 @@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.tiles.awareness.TilesRequestContextFactoryAware; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ServletTilesRequestContext; +import org.apache.tiles.request.TilesRequestContextFactory; +import org.apache.tiles.request.servlet.ServletTilesRequestContext; import org.apache.velocity.context.Context; /** Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java Sun Nov 8 12:16:06 2009 @@ -32,7 +32,7 @@ import org.apache.tiles.impl.InvalidTemplateException; import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ServletTilesRequestContext; +import org.apache.tiles.request.servlet.ServletTilesRequestContext; import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.util.IteratorEnumeration; import org.apache.velocity.Template; Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java Sun Nov 8 12:16:06 2009 @@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.context.TilesRequestContextFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; +import org.apache.tiles.request.TilesRequestContextFactory; import org.apache.velocity.context.Context; import org.junit.Test; Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java?rev=833862&r1=833861&r2=833862&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java Sun Nov 8 12:16:06 2009 @@ -33,8 +33,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.tiles.request.Request; -import org.apache.tiles.servlet.context.ExternalWriterHttpServletResponse; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.servlet.ServletUtil; +import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse; import org.apache.velocity.context.Context; import org.junit.Before; import org.junit.Test;
