You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/11/20 20:06:24 UTC
svn commit: r882674 [1/2] - in /tiles/sandbox/trunk/tiles3:
tiles-api/src/main/java/org/apache/tiles/
tiles-api/src/main/java/org/apache/tiles/access/
tiles-api/src/test/java/org/apache/tiles/access/
tiles-core/src/main/java/org/apache/tiles/impl/ tile...
Author: apetrelli
Date: Fri Nov 20 19:04:29 2009
New Revision: 882674
URL: http://svn.apache.org/viewvc?rev=882674&view=rev
Log:
TILESSB-14
Concentration of current container get/set in TilesAccess.
Added:
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java
- copied, changed from r880941, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/NoSuchContainerException.java
Removed:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/NoSuchContainerException.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertTemplateFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
Copied: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java (from r880941, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/NoSuchContainerException.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java?p2=tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/NoSuchContainerException.java&r1=880941&r2=882674&rev=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/NoSuchContainerException.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java Fri Nov 20 19:04:29 2009
@@ -18,9 +18,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.impl;
+package org.apache.tiles;
-import org.apache.tiles.TilesException;
/**
* Indicates that a keyed container has not been found.
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java Fri Nov 20 19:04:29 2009
@@ -20,8 +20,12 @@
*/
package org.apache.tiles.access;
+import java.util.Map;
+
+import org.apache.tiles.NoSuchContainerException;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +38,12 @@
public final class TilesAccess {
/**
+ * Name of the attribute used to store the current used container.
+ */
+ public static final String CURRENT_CONTAINER_ATTRIBUTE_NAME =
+ "org.apache.tiles.servlet.context.ServletTilesRequestContext.CURRENT_CONTAINER_KEY";
+
+ /**
* Constructor, private to avoid instantiation.
*/
private TilesAccess() {
@@ -113,4 +123,59 @@
return (TilesContainer) context.getApplicationScope().get(key);
}
+
+ /**
+ * Sets the current container to use in web pages.
+ *
+ * @param request The request to use.
+ * @param context The servlet context to use.
+ * @param key The key under which the container is stored.
+ * @since 2.1.0
+ */
+ public static void setCurrentContainer(Request request,
+ ApplicationContext applicationContext, String key) {
+ TilesContainer container = getContainer(applicationContext, key);
+ if (container != null) {
+ request.getRequestScope().put(CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ } else {
+ throw new NoSuchContainerException("The container with the key '"
+ + key + "' cannot be found");
+ }
+ }
+
+ /**
+ * Sets the current container to use in web pages.
+ *
+ * @param request The request to use.
+ * @param container The container to use as the current container.
+ * @since 2.1.0
+ */
+ public static void setCurrentContainer(Request request,
+ TilesContainer container) {
+ if (container != null) {
+ request.getRequestScope().put(CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ } else {
+ throw new NullPointerException("The container cannot be null");
+ }
+ }
+
+ /**
+ * Returns the current container that has been set, or the default one.
+ *
+ * @param request The request to use.
+ * @param context The servlet context to use.
+ * @return The current Tiles container to use in web pages.
+ * @since 2.1.0
+ */
+ public static TilesContainer getCurrentContainer(Request request,
+ ApplicationContext context) {
+ Map<String, Object> requestScope = request.getRequestScope();
+ TilesContainer container = (TilesContainer) requestScope.get(CURRENT_CONTAINER_ATTRIBUTE_NAME);
+ if (container == null) {
+ container = getContainer(context);
+ requestScope.put(CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ }
+
+ return container;
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java Fri Nov 20 19:04:29 2009
@@ -27,8 +27,10 @@
import java.util.Map;
import org.junit.Test;
+import org.apache.tiles.NoSuchContainerException;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Tests {@link TilesAccess}.
@@ -109,4 +111,127 @@
assertEquals(container, TilesAccess.getContainer(context, "myKey"));
verify(context, container);
}
+
+ /**
+ * Tests
+ * {@link ServletUtil#setCurrentContainer(ServletRequest, ServletContext, String)}.
+ */
+ @Test
+ public void testSetCurrentContainer() {
+ Request request = createMock(Request.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
+ TilesContainer container = createMock(TilesContainer.class);
+ Map<String, Object> attribs = new HashMap<String, Object>();
+ attribs.put("myKey", container);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+
+ expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
+ expect(request.getRequestScope()).andReturn(requestScope);
+ replay(request, context, container);
+ TilesAccess.setCurrentContainer(request, context, "myKey");
+ assertEquals(container, requestScope.get(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME));
+ verify(request, context, container);
+ }
+
+ /**
+ * Tests
+ * {@link ServletUtil#setCurrentContainer(ServletRequest, ServletContext, String)}.
+ */
+ @Test(expected=NoSuchContainerException.class)
+ public void testSetCurrentContainerException() {
+ Request request = createMock(Request.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
+ Map<String, Object> attribs = new HashMap<String, Object>();
+
+ expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
+ replay(request, context);
+ try {
+ TilesAccess.setCurrentContainer(request, context, "myKey");
+ } finally {
+ verify(request, context);
+ }
+ }
+
+ /**
+ * Tests
+ * {@link ServletUtil#setCurrentContainer(ServletRequest, TilesContainer)}.
+ */
+ @Test
+ public void testSetCurrentContainerWithContainer() {
+ Request request = createMock(Request.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
+ TilesContainer container = createMock(TilesContainer.class);
+ Map<String, Object> attribs = new HashMap<String, Object>();
+ attribs.put("myKey", container);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+
+ expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
+ expect(request.getRequestScope()).andReturn(requestScope);
+
+ replay(request, context, container);
+ TilesAccess.setCurrentContainer(request, container);
+ assertEquals(container, requestScope.get(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME));
+ verify(request, context, container);
+ }
+
+ /**
+ * Tests
+ * {@link ServletUtil#setCurrentContainer(ServletRequest, TilesContainer)}.
+ */
+ @Test(expected=NullPointerException.class)
+ public void testSetCurrentContainerWithContainerException() {
+ Request request = createMock(Request.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
+ Map<String, Object> attribs = new HashMap<String, Object>();
+
+ expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
+
+ replay(request, context);
+ try {
+ TilesAccess.setCurrentContainer(request, null);
+ } finally {
+ verify(request, context);
+ }
+ }
+
+ /**
+ * Tests {@link ServletUtil#getCurrentContainer(ServletRequest, ServletContext)}.
+ */
+ @Test
+ public void testGetCurrentContainer() {
+ Request request = createMock(Request.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
+ TilesContainer container = createMock(TilesContainer.class);
+ Map<String, Object> attribs = new HashMap<String, Object>();
+ attribs.put("myKey", container);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+
+ expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
+ expect(request.getRequestScope()).andReturn(requestScope);
+
+ replay(request, context, container);
+ assertEquals(container, TilesAccess.getCurrentContainer(request, context));
+ verify(request, context, container);
+ }
+
+ /**
+ * Tests {@link ServletUtil#getCurrentContainer(ServletRequest, ServletContext)}.
+ */
+ @Test
+ public void testGetCurrentContainerDefault() {
+ Request request = createMock(Request.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
+ TilesContainer container = createMock(TilesContainer.class);
+ Map<String, Object> attribs = new HashMap<String, Object>();
+ attribs.put(TilesAccess.CONTAINER_ATTRIBUTE, container);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+
+ expect(context.getApplicationScope()).andReturn(attribs).anyTimes();
+ expect(request.getRequestScope()).andReturn(requestScope);
+
+ replay(request, context, container);
+ assertEquals(container, TilesAccess.getCurrentContainer(request, context));
+ verify(request, context, container);
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java Fri Nov 20 19:04:29 2009
@@ -27,11 +27,11 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.ArrayStack;
+import org.apache.tiles.NoSuchContainerException;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.freemarker.io.NullWriter;
-import org.apache.tiles.impl.NoSuchContainerException;
import org.apache.tiles.servlet.context.ServletUtil;
import freemarker.core.Environment;
@@ -115,7 +115,7 @@
TilesContainer container = getContainer(env, key);
if (container != null) {
FreeMarkerRequestUtil.getRequestHashModel(env).getRequest().setAttribute(
- ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
} else {
throw new NoSuchContainerException("The container with the key '"
+ key + "' cannot be found");
@@ -132,8 +132,7 @@
public static void setCurrentContainer(Environment env,
TilesContainer container) {
ServletUtil.setCurrentContainer(FreeMarkerRequestUtil.getRequestHashModel(env).getRequest(),
- getServletContextHashModel(env).getServlet()
- .getServletContext(), container);
+ container);
}
/**
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=882674&r1=882673&r2=882674&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 Fri Nov 20 19:04:29 2009
@@ -37,10 +37,10 @@
import javax.servlet.http.HttpSession;
import org.apache.tiles.ArrayStack;
+import org.apache.tiles.NoSuchContainerException;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.io.NullWriter;
-import org.apache.tiles.impl.NoSuchContainerException;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.junit.Before;
import org.junit.Test;
@@ -197,7 +197,7 @@
ServletContextHashModel servletContextModel = new ServletContextHashModel(servlet, objectWrapper);
expect(model.get("Request")).andReturn(requestModel);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
expect(model.get("Application")).andReturn(servletContextModel);
expect(servletContext.getAttribute("myKey")).andReturn(container);
@@ -255,7 +255,7 @@
ServletContextHashModel servletContextModel = new ServletContextHashModel(servlet, objectWrapper);
expect(model.get("Request")).andReturn(requestModel);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
expect(model.get("Application")).andReturn(servletContextModel);
replay(template, model, servletContext, container, request);
@@ -284,7 +284,7 @@
ServletContextHashModel servletContextModel = new ServletContextHashModel(servlet, objectWrapper);
expect(model.get("Request")).andReturn(requestModel);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(model.get("Application")).andReturn(servletContextModel);
replay(template, model, servletContext, container, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -38,7 +38,6 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.AddAttributeModel;
import org.junit.Before;
import org.junit.Test;
@@ -130,8 +129,8 @@
expect(model.get(FreemarkerServlet.KEY_REQUEST)).andReturn(requestModel).anyTimes();
expect(model.get(FreemarkerServlet.KEY_APPLICATION)).andReturn(servletContextModel).anyTimes();
initEnvironment();
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
TemplateDirectiveBody body = createMock(TemplateDirectiveBody.class);
Map<String, Object> params = new HashMap<String, Object>();
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -39,7 +39,6 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.AddListAttributeModel;
import org.junit.Before;
import org.junit.Test;
@@ -130,8 +129,8 @@
ServletContextHashModel servletContextModel = new ServletContextHashModel(servlet, objectWrapper);
expect(model.get(FreemarkerServlet.KEY_APPLICATION)).andReturn(servletContextModel).anyTimes();
initEnvironment();
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
TemplateDirectiveBody body = createMock(TemplateDirectiveBody.class);
Map<String, Object> params = new HashMap<String, Object>();
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -39,7 +39,6 @@
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.DefinitionModel;
import org.junit.Before;
import org.junit.Test;
@@ -120,8 +119,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -40,7 +40,6 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.GetAsStringModel;
import org.junit.Before;
import org.junit.Test;
@@ -121,8 +120,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/ImportAttributeFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -41,7 +41,6 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.ImportAttributeModel;
import org.junit.Before;
import org.junit.Test;
@@ -123,8 +122,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
@@ -176,8 +175,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
request.setAttribute("one", "value1");
request.setAttribute("two", "value2");
replay(request);
@@ -231,8 +230,8 @@
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpSession session = createMock(HttpSession.class);
expect(request.getSession()).andReturn(session).times(2);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
session.setAttribute("one", "value1");
session.setAttribute("two", "value2");
replay(request, session);
@@ -284,8 +283,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -40,7 +40,6 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertAttributeModel;
import org.junit.Before;
import org.junit.Test;
@@ -121,8 +120,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -40,7 +40,6 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertDefinitionModel;
import org.junit.Before;
import org.junit.Test;
@@ -121,8 +120,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
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=882674&r1=882673&r2=882674&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 Fri Nov 20 19:04:29 2009
@@ -40,7 +40,6 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertTemplateModel;
import org.junit.Before;
import org.junit.Test;
@@ -126,8 +125,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
request
.setAttribute(
org.apache.tiles.request.servlet.ServletUtil.FORCE_INCLUDE_ATTRIBUTE_NAME,
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -38,7 +38,6 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.PutAttributeModel;
import org.junit.Before;
import org.junit.Test;
@@ -119,8 +118,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -39,7 +39,6 @@
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.PutListAttributeModel;
import org.junit.Before;
import org.junit.Test;
@@ -120,8 +119,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModelTest.java Fri Nov 20 19:04:29 2009
@@ -35,7 +35,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.access.TilesAccess;
import org.junit.Before;
import org.junit.Test;
@@ -112,7 +112,7 @@
TilesContainer container = createMock(TilesContainer.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, objectWrapper);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspUtil.java Fri Nov 20 19:04:29 2009
@@ -32,9 +32,9 @@
import javax.servlet.jsp.tagext.JspFragment;
import org.apache.tiles.ArrayStack;
+import org.apache.tiles.NoSuchContainerException;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.impl.NoSuchContainerException;
import org.apache.tiles.jsp.taglib.TilesJspException;
import org.apache.tiles.servlet.context.ServletUtil;
import org.slf4j.Logger;
@@ -148,7 +148,7 @@
public static void setCurrentContainer(JspContext context, String key) {
TilesContainer container = getContainer(context, key);
if (container != null) {
- context.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ context.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container, PageContext.REQUEST_SCOPE);
} else {
throw new NoSuchContainerException("The container with the key '"
@@ -166,7 +166,7 @@
public static void setCurrentContainer(JspContext context,
TilesContainer container) {
if (container != null) {
- context.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ context.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container, PageContext.REQUEST_SCOPE);
} else {
throw new NoSuchContainerException("The container cannot be null");
@@ -182,11 +182,11 @@
*/
public static TilesContainer getCurrentContainer(JspContext context) {
TilesContainer container = (TilesContainer) context.getAttribute(
- ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
PageContext.REQUEST_SCOPE);
if (container == null) {
container = getContainer(context);
- context.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ context.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container, PageContext.REQUEST_SCOPE);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/JspUtilTest.java Fri Nov 20 19:04:29 2009
@@ -112,9 +112,9 @@
pageContext
.getAttribute("myKey", PageContext.APPLICATION_SCOPE))
.andReturn(container);
- pageContext.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ pageContext.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container, PageContext.REQUEST_SCOPE);
- EasyMock.expect(pageContext.getAttribute(ServletUtil
+ EasyMock.expect(pageContext.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME, PageContext.REQUEST_SCOPE))
.andReturn(container);
EasyMock.replay(pageContext, container);
@@ -132,9 +132,9 @@
PageContext pageContext = EasyMock.createMock(PageContext.class);
ServletContext context = EasyMock.createMock(ServletContext.class);
TilesContainer container = EasyMock.createMock(TilesContainer.class);
- pageContext.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ pageContext.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container, PageContext.REQUEST_SCOPE);
- EasyMock.expect(pageContext.getAttribute(ServletUtil
+ EasyMock.expect(pageContext.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME, PageContext.REQUEST_SCOPE))
.andReturn(container);
EasyMock.replay(pageContext, context, container);
@@ -153,18 +153,18 @@
TilesContainer.class);
TilesContainer alternateContainer = EasyMock.createMock(
TilesContainer.class);
- EasyMock.expect(pageContext.getAttribute(ServletUtil
+ EasyMock.expect(pageContext.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME, PageContext.REQUEST_SCOPE))
.andReturn(null);
EasyMock.expect(
pageContext.getAttribute(TilesAccess.CONTAINER_ATTRIBUTE,
PageContext.APPLICATION_SCOPE)).andReturn(
defaultContainer);
- pageContext.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ pageContext.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
defaultContainer, PageContext.REQUEST_SCOPE);
- pageContext.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ pageContext.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
alternateContainer, PageContext.REQUEST_SCOPE);
- EasyMock.expect(pageContext.getAttribute(ServletUtil
+ EasyMock.expect(pageContext.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME, PageContext.REQUEST_SCOPE))
.andReturn(alternateContainer);
EasyMock.replay(pageContext, defaultContainer, alternateContainer);
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=882674&r1=882673&r2=882674&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 Fri Nov 20 19:04:29 2009
@@ -24,12 +24,10 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.ArrayStack;
+import org.apache.tiles.NoSuchContainerException;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
-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;
@@ -49,17 +47,6 @@
public final class ServletUtil {
/**
- * The name of the attribute that will contain the compose stack.
- */
- public static final String COMPOSE_STACK_ATTRIBUTE_NAME = "org.apache.tiles.template.COMPOSE_STACK";
-
- /**
- * Name of the attribute used to store the current used container.
- */
- public static final String CURRENT_CONTAINER_ATTRIBUTE_NAME =
- "org.apache.tiles.servlet.context.ServletTilesRequestContext.CURRENT_CONTAINER_KEY";
-
- /**
* Private constructor to avoid instantiation.
*/
private ServletUtil() {
@@ -143,7 +130,7 @@
ServletContext context, String key) {
TilesContainer container = getContainer(context, key);
if (container != null) {
- request.setAttribute(CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
} else {
throw new NoSuchContainerException("The container with the key '"
+ key + "' cannot be found");
@@ -154,14 +141,13 @@
* Sets the current container to use in web pages.
*
* @param request The request to use.
- * @param context The servlet context to use.
* @param container The container to use as the current container.
* @since 2.1.0
*/
public static void setCurrentContainer(ServletRequest request,
- ServletContext context, TilesContainer container) {
+ TilesContainer container) {
if (container != null) {
- request.setAttribute(CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
} else {
throw new NoSuchContainerException("The container cannot be null");
}
@@ -178,35 +164,16 @@
public static TilesContainer getCurrentContainer(ServletRequest request,
ServletContext context) {
TilesContainer container = (TilesContainer) request
- .getAttribute(CURRENT_CONTAINER_ATTRIBUTE_NAME);
+ .getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME);
if (container == null) {
container = getContainer(context);
- request.setAttribute(CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
}
return container;
}
/**
- * Returns the compose stack, that is used by the tags to compose
- * definitions, attributes, etc.
- *
- * @param request The HTTP request.
- * @return The compose stack.
- * @since 2.2.0
- */
- @SuppressWarnings("unchecked")
- public static ArrayStack<Object> getComposeStack(HttpServletRequest request) {
- ArrayStack<Object> composeStack = (ArrayStack<Object>) request.getAttribute(
- COMPOSE_STACK_ATTRIBUTE_NAME);
- if (composeStack == null) {
- composeStack = new ArrayStack<Object>();
- request.setAttribute(COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
- }
- return composeStack;
- }
-
- /**
* Opens a TilesRequestContext until it finds a ServletTilesRequestContext.
*
* @param request The request to open.
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletUtilTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletUtilTest.java Fri Nov 20 19:04:29 2009
@@ -95,9 +95,9 @@
ServletContext context = EasyMock.createMock(ServletContext.class);
TilesContainer container = EasyMock.createMock(TilesContainer.class);
EasyMock.expect(context.getAttribute("myKey")).andReturn(container);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container);
- EasyMock.expect(request.getAttribute(ServletUtil
+ EasyMock.expect(request.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
EasyMock.replay(request, context, container);
ServletUtil.setCurrentContainer(request, context, "myKey");
@@ -107,18 +107,18 @@
/**
* Tests
- * {@link ServletUtil#setCurrentContainer(ServletRequest, ServletContext, TilesContainer)}.
+ * {@link ServletUtil#setCurrentContainer(ServletRequest, TilesContainer)}.
*/
public void testSetCurrentContainerWithContainer() {
ServletRequest request = EasyMock.createMock(ServletRequest.class);
ServletContext context = EasyMock.createMock(ServletContext.class);
TilesContainer container = EasyMock.createMock(TilesContainer.class);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container);
- EasyMock.expect(request.getAttribute(ServletUtil
+ EasyMock.expect(request.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
EasyMock.replay(request, context, container);
- ServletUtil.setCurrentContainer(request, context, container);
+ ServletUtil.setCurrentContainer(request, container);
assertTrue("The containers are not the same", ServletUtil
.getCurrentContainer(request, context) == container);
}
@@ -133,22 +133,22 @@
TilesContainer.class);
TilesContainer alternateContainer = EasyMock.createMock(
TilesContainer.class);
- EasyMock.expect(request.getAttribute(ServletUtil
+ EasyMock.expect(request.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
EasyMock.expect(context.getAttribute(TilesAccess.CONTAINER_ATTRIBUTE))
.andReturn(defaultContainer);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
defaultContainer);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
alternateContainer);
- EasyMock.expect(request.getAttribute(ServletUtil
+ EasyMock.expect(request.getAttribute(TilesAccess
.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(alternateContainer);
EasyMock.replay(request, context, defaultContainer, alternateContainer);
TilesContainer currentContainer = ServletUtil.getCurrentContainer(
request, context);
assertTrue("The containers are not the same",
currentContainer == defaultContainer);
- ServletUtil.setCurrentContainer(request, context, alternateContainer);
+ ServletUtil.setCurrentContainer(request, alternateContainer);
currentContainer = ServletUtil.getCurrentContainer(request, context);
EasyMock.verify(request, context, defaultContainer, alternateContainer);
assertTrue("The containers are not the same",
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java Fri Nov 20 19:04:29 2009
@@ -40,7 +40,6 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.portlet.context.PortletTilesRequestContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.servlet.context.ServletUtil;
/**
* Test Portlet.
@@ -117,10 +116,10 @@
private static TilesContainer getCurrentContainer(PortletRequest request,
PortletContext context) {
TilesContainer container = (TilesContainer) request
- .getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME);
+ .getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME);
if (container == null) {
container = getContainer(context);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME,
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME,
container);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java Fri Nov 20 19:04:29 2009
@@ -34,8 +34,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.AddAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -93,7 +93,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq("myValue"), eq("myExpression"), (String) isNull(),
eq("myRole"), eq("myType"), isA(VelocityTilesRequestContext.class));
@@ -118,7 +118,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.start(isA(VelocityTilesRequestContext.class));
@@ -146,7 +146,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.end(eq("myValue"), eq("myExpression"), (String) isNull(),
eq("myRole"), eq("myType"), isA(VelocityTilesRequestContext.class));
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java Fri Nov 20 19:04:29 2009
@@ -33,8 +33,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.AddListAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -87,7 +87,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.start(eq("myRole"), isA(VelocityTilesRequestContext.class));
replay(tModel, request, response, velocityContext, servletContext, container, applicationContext);
@@ -109,7 +109,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.end(isA(VelocityTilesRequestContext.class));
replay(tModel, request, response, velocityContext, servletContext, container, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java Fri Nov 20 19:04:29 2009
@@ -33,9 +33,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.DefinitionModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -87,7 +87,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq(container), eq("myName"), eq("myTemplate"),
eq("myRole"), eq("myExtends"), eq("myPreparer"),
isA(VelocityTilesRequestContext.class));
@@ -113,7 +113,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.start(eq("myName"), eq("myTemplate"), eq("myRole"),
eq("myExtends"), eq("myPreparer"),
isA(VelocityTilesRequestContext.class));
@@ -139,7 +139,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.end(eq(container), isA(VelocityTilesRequestContext.class));
replay(tModel, servletContext, request, response, velocityContext, container, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java Fri Nov 20 19:04:29 2009
@@ -38,8 +38,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.GetAsStringModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -107,7 +107,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq(container), eq(writer), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute),
isA(VelocityTilesRequestContext.class));
@@ -135,7 +135,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
@@ -168,7 +168,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(eq(container), eq(writer), eq(false), isA(VelocityTilesRequestContext.class));
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java Fri Nov 20 19:04:29 2009
@@ -36,8 +36,8 @@
import javax.servlet.http.HttpSession;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.ImportAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -96,7 +96,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
isA(VelocityTilesRequestContext.class))).andReturn(attributes);
expect(internalContextAdapter.put("one", "value1")).andReturn("value1");
@@ -131,7 +131,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
isA(VelocityTilesRequestContext.class))).andReturn(attributes);
request.setAttribute("one", "value1");
@@ -167,7 +167,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
isA(VelocityTilesRequestContext.class))).andReturn(attributes);
expect(request.getSession()).andReturn(session).times(2);
@@ -203,7 +203,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false),
isA(VelocityTilesRequestContext.class))).andReturn(attributes);
servletContext.setAttribute("one", "value1");
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java Fri Nov 20 19:04:29 2009
@@ -38,8 +38,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -107,7 +107,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute),
isA(VelocityTilesRequestContext.class));
@@ -135,7 +135,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
@@ -168,7 +168,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(eq(container), eq(false), isA(VelocityTilesRequestContext.class));
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java Fri Nov 20 19:04:29 2009
@@ -37,8 +37,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertDefinitionModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -99,7 +99,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq(container), eq("myDefinitionName"), eq("myTemplate"),
eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"),
eq("myPreparer"), isA(VelocityTilesRequestContext.class));
@@ -127,7 +127,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(eq(container), isA(VelocityTilesRequestContext.class));
@@ -159,7 +159,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(eq(container), eq("myDefinitionName"), eq("myTemplate"),
eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"),
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java Fri Nov 20 19:04:29 2009
@@ -37,8 +37,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertTemplateModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
@@ -99,7 +99,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq(container), eq("myTemplate"), eq("myTemplateType"),
eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"),
isA(VelocityTilesRequestContext.class));
@@ -127,7 +127,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(eq(container), isA(VelocityTilesRequestContext.class));
@@ -159,7 +159,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(eq(container), eq("myTemplate"), eq("myTemplateType"),
eq("myTemplateExpression"), eq("myRole"),
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java Fri Nov 20 19:04:29 2009
@@ -34,8 +34,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.PutAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -92,7 +92,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.execute(eq(container), eq("myName"), eq("myValue"), eq("myExpression"),
(String) isNull(), eq("myRole"), eq("myType"), eq(false),
isA(VelocityTilesRequestContext.class));
@@ -119,7 +119,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.start(isA(VelocityTilesRequestContext.class));
@@ -148,7 +148,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.end(eq(container), eq("myName"), eq("myValue"), eq("myExpression"),
(String) isNull(), eq("myRole"), eq("myType"), eq(false),
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java Fri Nov 20 19:04:29 2009
@@ -34,8 +34,8 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.PutListAttributeModel;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -93,7 +93,7 @@
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.start(eq("myRole"), eq(false), isA(VelocityTilesRequestContext.class));
@@ -123,7 +123,7 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
tModel.end(eq(container), eq("myName"), eq(false), isA(VelocityTilesRequestContext.class));
replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java?rev=882674&r1=882673&r2=882674&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java Fri Nov 20 19:04:29 2009
@@ -34,8 +34,8 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.velocity.context.VelocityTilesRequestContext;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.Renderable;
@@ -410,7 +410,7 @@
TilesContainer container = createMock(TilesContainer.class);
expect(servletContext.getAttribute("myKey")).andReturn(container);
- request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
+ request.setAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(velocityContext, request, response, servletContext, container);
initializeTool();
@@ -467,7 +467,7 @@
Attribute attribute = new Attribute("myAttributeValue");
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+ expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(
container
.getAttributeContext(isA(VelocityTilesRequestContext.class)))