Author: apetrelli
Date: Thu Sep 2 19:46:29 2010
New Revision: 992079
URL: http://svn.apache.org/viewvc?rev=992079&view=rev
Log:
TILESSB-35
Delete ServletUtil in tiles-servlet, moving everything in tiles-request-servlet.
Created VelocityRenderer and added delegation in Tiles.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
(with props)
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
- copied, changed from r992052,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java
(with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java?rev=992079&r1=992078&r2=992079&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
Thu Sep 2 19:46:29 2010
@@ -27,7 +27,9 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.request.util.ApplicationAccess;
+import org.apache.tiles.request.util.RequestWrapper;
/**
* Utilities for Tiles request servlet support.
@@ -64,4 +66,47 @@ public final class ServletUtil {
return (ApplicationContext) servletContext
.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE);
}
+
+ /**
+ * Opens a TilesRequestContext until it finds a ServletTilesRequestContext.
+ *
+ * @param request The request to open.
+ * @return The servlet-based request context.
+ * @throws NotAServletEnvironmentException If a servlet-based request
+ * context could not be found.
+ * @since 2.2.0
+ */
+ public static ServletRequest getServletRequest(Request request) {
+ Request currentRequest = request;
+ while (true) {
+ if (currentRequest == null) {
+ throw new NotAServletEnvironmentException("Last Tiles request
context is null");
+ }
+
+ if (currentRequest instanceof ServletRequest) {
+ return (ServletRequest) currentRequest;
+ }
+ if (!(currentRequest instanceof RequestWrapper)) {
+ throw new NotAServletEnvironmentException("Not a Servlet
environment, not supported");
+ }
+ currentRequest = ((RequestWrapper)
currentRequest).getWrappedRequest();
+ }
+ }
+
+ /**
+ * Gets a servlet context from a TilesApplicationContext.
+ *
+ * @param applicationContext The application context to analyze.
+ * @return The servlet context.
+ * @throws NotAServletEnvironmentException If the application context is
not
+ * servlet-based.
+ * @since 2.2.0
+ */
+ public static ServletContext getServletContext(ApplicationContext
applicationContext) {
+ if (applicationContext instanceof ServletApplicationContext) {
+ return (ServletContext) ((ServletApplicationContext)
applicationContext).getContext();
+ }
+
+ throw new NotAServletEnvironmentException("Not a Servlet-based
environment");
+ }
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml?rev=992079&r1=992078&r2=992079&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml Thu Sep 2
19:46:29 2010
@@ -17,11 +17,6 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-request-servlet</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -45,5 +40,10 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-servlet</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java?rev=992079&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
(added)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
Thu Sep 2 19:46:29 2010
@@ -0,0 +1,62 @@
+package org.apache.tiles.request.velocity.render;
+
+import java.util.Enumeration;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.collection.IteratorEnumeration;
+import org.apache.tiles.request.servlet.ServletUtil;
+import org.apache.velocity.tools.view.JeeConfig;
+
+/**
+ * Implements JeeConfig to use parameters set through
+ * {...@link VelocityRenderer#setParameter(String, String)}.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.2.0
+ */
+public class ApplicationContextJeeConfig implements JeeConfig {
+
+ /**
+ * The application context.
+ */
+ private ApplicationContext applicationContext;
+
+ /**
+ * The initialization parameters for VelocityView.
+ */
+ private Map<String, String> params;
+
+ public ApplicationContextJeeConfig(ApplicationContext applicationContext,
Map<String, String> params) {
+ this.applicationContext = applicationContext;
+ this.params = params;
+ }
+
+ /** {...@inheritdoc} */
+ public String getInitParameter(String name) {
+ return params.get(name);
+ }
+
+ /** {...@inheritdoc} */
+ public String findInitParameter(String key) {
+ return params.get(key);
+ }
+
+ /** {...@inheritdoc} */
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public Enumeration getInitParameterNames() {
+ return new IteratorEnumeration(params.keySet().iterator());
+ }
+
+ /** {...@inheritdoc} */
+ public String getName() {
+ return "Application Context JEE Config";
+ }
+
+ /** {...@inheritdoc} */
+ public ServletContext getServletContext() {
+ return ServletUtil.getServletContext(applicationContext);
+ }
+}
\ No newline at end of file
Propchange:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
(from r992052,
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/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java&p1=tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java&r1=992052&r2=992079&rev=992079&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java
Thu Sep 2 19:46:29 2010
@@ -19,27 +19,17 @@
* under the License.
*/
-package org.apache.tiles.velocity.renderer;
+package org.apache.tiles.request.velocity.render;
import java.io.IOException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tiles.Attribute;
-import org.apache.tiles.impl.InvalidTemplateException;
-import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer;
-import org.apache.tiles.request.ApplicationContext;
+
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.collection.IteratorEnumeration;
+import org.apache.tiles.request.render.InvalidTemplateException;
+import org.apache.tiles.request.render.TypeDetectingRenderer;
import org.apache.tiles.request.servlet.ServletRequest;
-import org.apache.tiles.request.util.ApplicationContextAware;
-import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.JeeConfig;
import org.apache.velocity.tools.view.VelocityView;
/**
@@ -52,61 +42,20 @@ import org.apache.velocity.tools.view.Ve
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class VelocityAttributeRenderer extends
- AbstractTypeDetectingAttributeRenderer implements
- ApplicationContextAware {
+public class VelocityRenderer implements TypeDetectingRenderer {
/**
* The VelocityView object to use.
*/
private VelocityView velocityView;
- /**
- * The initialization parameters for VelocityView.
- */
- private Map<String, String> params = new HashMap<String, String>();
-
- /**
- * The application context.
- *
- * @since 3.0.0
- */
- private ApplicationContext applicationContext;
-
- /**
- * Sets a parameter for the internal servlet.
- *
- * @param key The name of the parameter.
- * @param value The value of the parameter.
- * @since 2.2.0
- */
- public void setParameter(String key, String value) {
- params.put(key, value);
- }
-
- /**
- * Sets the application context.
- *
- * @param applicationContext The application context.
- * @since 3.0.0
- */
- public void setApplicationContext(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
- }
-
- /**
- * Commits the parameters and makes this renderer ready for the use.
- *
- * @since 2.2.0
- */
- public void commit() {
- velocityView = new VelocityView(new
TilesApplicationContextJeeConfig());
+ public VelocityRenderer(VelocityView velocityView) {
+ this.velocityView = velocityView;
}
/** {...@inheritdoc} */
@Override
- public void write(Object value, Attribute attribute,
- Request request) throws IOException {
+ public void render(String value, Request request) throws IOException {
if (value != null) {
if (value instanceof String) {
ServletRequest servletRequest =
ServletUtil.getServletRequest(request);
@@ -130,48 +79,7 @@ public class VelocityAttributeRenderer e
}
/** {...@inheritdoc} */
- public boolean isRenderable(Object value, Attribute attribute,
- Request request) {
- if (value instanceof String) {
- String string = (String) value;
- return string.startsWith("/") && string.endsWith(".vm");
- }
- return false;
- }
-
- /**
- * Implements JeeConfig to use parameters set through
- * {...@link VelocityAttributeRenderer#setParameter(String, String)}.
- *
- * @version $Rev$ $Date$
- * @since 2.2.0
- */
- private class TilesApplicationContextJeeConfig implements JeeConfig {
-
- /** {...@inheritdoc} */
- public String getInitParameter(String name) {
- return params.get(name);
- }
-
- /** {...@inheritdoc} */
- public String findInitParameter(String key) {
- return params.get(key);
- }
-
- /** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
- public Enumeration getInitParameterNames() {
- return new IteratorEnumeration(params.keySet().iterator());
- }
-
- /** {...@inheritdoc} */
- public String getName() {
- return "Tiles Application Context JEE Config";
- }
-
- /** {...@inheritdoc} */
- public ServletContext getServletContext() {
- return ServletUtil.getServletContext(applicationContext);
- }
+ public boolean isRenderable(String string, Request request) {
+ return string.startsWith("/") && string.endsWith(".vm");
}
}
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java?rev=992079&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java
(added)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java
Thu Sep 2 19:46:29 2010
@@ -0,0 +1,55 @@
+package org.apache.tiles.request.velocity.render;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.velocity.tools.view.VelocityView;
+
+public class VelocityRendererBuilder {
+
+ /**
+ * The initialization parameters for VelocityView.
+ */
+ private Map<String, String> params = new HashMap<String, String>();
+
+ /**
+ * The application context.
+ */
+ private ApplicationContext applicationContext;
+
+ private VelocityRendererBuilder() {
+ }
+
+ public static VelocityRendererBuilder createInstance() {
+ return new VelocityRendererBuilder();
+ }
+
+ /**
+ * Sets a parameter for the internal servlet.
+ *
+ * @param key The name of the parameter.
+ * @param value The value of the parameter.
+ */
+ public VelocityRendererBuilder setParameter(String key, String value) {
+ params.put(key, value);
+ return this;
+ }
+
+ /**
+ * Sets the application context.
+ *
+ * @param applicationContext The application context.
+ */
+ public VelocityRendererBuilder setApplicationContext(ApplicationContext
applicationContext) {
+ this.applicationContext = applicationContext;
+ return this;
+ }
+
+ public VelocityRenderer build() {
+ VelocityView velocityView = new VelocityView(
+ new ApplicationContextJeeConfig(applicationContext, params));
+ return new VelocityRenderer(velocityView);
+ }
+}
Propchange:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=992079&r1=992078&r2=992079&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Thu Sep 2 19:46:29 2010
@@ -77,10 +77,12 @@ import org.apache.tiles.renderer.Attribu
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
+import org.apache.tiles.renderer.impl.DelegateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
+import org.apache.tiles.request.velocity.render.VelocityRenderer;
+import org.apache.tiles.request.velocity.render.VelocityRendererBuilder;
import org.apache.tiles.util.URLUtil;
-import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.mvel2.integration.VariableResolverFactory;
/**
@@ -141,11 +143,12 @@ public class CompleteAutoloadTilesContai
freemarkerRenderer.commit();
rendererFactory.registerRenderer(FREEMARKER_RENDERER_NAME,
freemarkerRenderer);
- VelocityAttributeRenderer velocityRenderer = new
VelocityAttributeRenderer();
- velocityRenderer.setApplicationContext(applicationContext);
-
velocityRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
- velocityRenderer.commit();
- rendererFactory.registerRenderer(VELOCITY_RENDERER_NAME,
velocityRenderer);
+ VelocityRenderer velocityRenderer = VelocityRendererBuilder
+ .createInstance().setApplicationContext(applicationContext)
+ .build();
+ rendererFactory.registerRenderer(VELOCITY_RENDERER_NAME,
+ new DelegateAttributeRenderer(velocityRenderer,
+ attributeEvaluatorFactory));
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java?rev=992079&r1=992078&r2=992079&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
Thu Sep 2 19:46:29 2010
@@ -66,7 +66,6 @@ import org.apache.tiles.renderer.impl.De
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.servlet.ServletApplicationContext;
-import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.apache.velocity.tools.view.VelocityView;
import org.junit.Before;
import org.junit.Test;
@@ -133,7 +132,7 @@ public class CompleteAutoloadTilesContai
rendererFactory.registerRenderer(eq("freemarker"),
isA(FreeMarkerAttributeRenderer.class));
rendererFactory.registerRenderer(eq("velocity"),
- isA(VelocityAttributeRenderer.class));
+ isA(DelegateAttributeRenderer.class));
expect(applicationContext.getContext()).andReturn(servletContext)
.anyTimes();
Modified:
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=992079&r1=992078&r2=992079&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
Thu Sep 2 19:46:29 2010
@@ -43,7 +43,6 @@ import org.apache.tiles.request.collecti
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.request.util.ApplicationContextAware;
-import org.apache.tiles.servlet.context.ServletUtil;
/**
* FreeMarker renderer for rendering FreeMarker templates as Tiles attributes.
@@ -118,7 +117,7 @@ public class FreeMarkerAttributeRenderer
Request request) throws IOException {
if (value != null) {
if (value instanceof String) {
- ServletRequest servletRequest =
ServletUtil.getServletRequest(request);
+ ServletRequest servletRequest =
org.apache.tiles.request.servlet.ServletUtil.getServletRequest(request);
HttpServletRequest httpRequest = servletRequest.getRequest();
HttpServletResponse httpResponse =
servletRequest.getResponse();
servlet.setValue((String) value);
@@ -200,7 +199,7 @@ public class FreeMarkerAttributeRenderer
/** {...@inheritdoc} */
public ServletContext getServletContext() {
- return ServletUtil.getServletContext(applicationContext);
+ return
org.apache.tiles.request.servlet.ServletUtil.getServletContext(applicationContext);
}
/** {...@inheritdoc} */
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=992079&r1=992078&r2=992079&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
Thu Sep 2 19:46:29 2010
@@ -36,7 +36,6 @@ import org.apache.tiles.request.Request;
import org.apache.tiles.request.collection.IteratorEnumeration;
import org.apache.tiles.request.servlet.ServletRequest;
import org.apache.tiles.request.util.ApplicationContextAware;
-import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.JeeConfig;
@@ -109,7 +108,7 @@ public class VelocityAttributeRenderer e
Request request) throws IOException {
if (value != null) {
if (value instanceof String) {
- ServletRequest servletRequest =
ServletUtil.getServletRequest(request);
+ ServletRequest servletRequest =
org.apache.tiles.request.servlet.ServletUtil.getServletRequest(request);
// then get a context
Context context = velocityView.createContext(servletRequest
.getRequest(), servletRequest.getResponse());
@@ -171,7 +170,7 @@ public class VelocityAttributeRenderer e
/** {...@inheritdoc} */
public ServletContext getServletContext() {
- return ServletUtil.getServletContext(applicationContext);
+ return
org.apache.tiles.request.servlet.ServletUtil.getServletContext(applicationContext);
}
}
}
