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/12/16 21:51:51 UTC
svn commit: r891422 - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/
tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/
tiles-request/tiles-request-freemarker/src/main/java/org/ap...
Author: apetrelli
Date: Wed Dec 16 20:51:50 2009
New Revision: 891422
URL: http://svn.apache.org/viewvc?rev=891422&view=rev
Log:
TILESSB-19
Killed TilesRequestContextFactory and related code.
Removed some TilesApplicationContextAware implementations.
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/TilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
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-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Wed Dec 16 20:51:50 2009
@@ -305,7 +305,6 @@
.getRenderer(TEMPLATE_RENDERER_NAME));
retValue.addAttributeRenderer((TypeDetectingAttributeRenderer) rendererFactory
.getRenderer(STRING_RENDERER_NAME));
- retValue.setApplicationContext(applicationContext);
retValue.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return retValue;
}
@@ -374,7 +373,6 @@
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
StringAttributeRenderer stringRenderer = new StringAttributeRenderer();
- stringRenderer.setApplicationContext(applicationContext);
stringRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return stringRenderer;
}
@@ -395,7 +393,6 @@
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
TemplateAttributeRenderer templateRenderer = new TemplateAttributeRenderer();
- templateRenderer.setApplicationContext(applicationContext);
templateRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return templateRenderer;
}
@@ -416,7 +413,6 @@
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
DefinitionAttributeRenderer definitionRenderer = new DefinitionAttributeRenderer();
- definitionRenderer.setApplicationContext(applicationContext);
definitionRenderer.setContainer(container);
definitionRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return definitionRenderer;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java Wed Dec 16 20:51:50 2009
@@ -25,13 +25,10 @@
import java.util.Set;
import org.apache.tiles.Attribute;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
import org.apache.tiles.renderer.AttributeRenderer;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +40,7 @@
* @since 2.1.0
*/
public abstract class AbstractBaseAttributeRenderer implements
- AttributeRenderer, TilesApplicationContextAware,
- AttributeEvaluatorFactoryAware {
+ AttributeRenderer, AttributeEvaluatorFactoryAware {
/**
* The logging object.
@@ -53,13 +49,6 @@
.getLogger(AbstractBaseAttributeRenderer.class);
/**
- * The Tiles application context.
- *
- * @since 2.1.0
- */
- protected ApplicationContext applicationContext;
-
- /**
* The attribute evaluator factory.
*
* @since 2.2.0
@@ -67,11 +56,6 @@
protected AttributeEvaluatorFactory attributeEvaluatorFactory;
/** {@inheritDoc} */
- public void setApplicationContext(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
- }
-
- /** {@inheritDoc} */
public void setAttributeEvaluatorFactory(AttributeEvaluatorFactory attributeEvaluatorFactory) {
this.attributeEvaluatorFactory = attributeEvaluatorFactory;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java Wed Dec 16 20:51:50 2009
@@ -49,7 +49,6 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
/**
@@ -196,7 +195,6 @@
*/
public void testCreateDefaultAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContextFactory requestContextFactory = createMock(TilesRequestContextFactory.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
AttributeRenderer stringRenderer = createMock(TypeDetectingAttributeRenderer.class);
@@ -207,15 +205,13 @@
expect(rendererFactory.getRenderer("template")).andReturn(templateRenderer);
expect(rendererFactory.getRenderer("definition")).andReturn(definitionRenderer);
- replay(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ replay(container, attributeEvaluatorFactory, rendererFactory);
AttributeRenderer renderer = factory.createDefaultAttributeRenderer(
rendererFactory, applicationContext, container,
attributeEvaluatorFactory);
assertTrue("The default renderer class is not correct",
renderer instanceof ChainedDelegateAttributeRenderer);
- verify(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ verify(container, attributeEvaluatorFactory, rendererFactory);
}
/**
@@ -225,19 +221,16 @@
*/
public void testCreateStringAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContextFactory requestContextFactory = createMock(TilesRequestContextFactory.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
- replay(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ replay(container, attributeEvaluatorFactory, rendererFactory);
AttributeRenderer renderer = factory.createStringAttributeRenderer(
rendererFactory, applicationContext, container,
attributeEvaluatorFactory);
assertTrue("The renderer class is not correct",
renderer instanceof StringAttributeRenderer);
- verify(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ verify(container, attributeEvaluatorFactory, rendererFactory);
}
/**
@@ -247,19 +240,16 @@
*/
public void testCreateTemplateAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContextFactory requestContextFactory = createMock(TilesRequestContextFactory.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
- replay(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ replay(container, attributeEvaluatorFactory, rendererFactory);
AttributeRenderer renderer = factory.createTemplateAttributeRenderer(
rendererFactory, applicationContext, container,
attributeEvaluatorFactory);
assertTrue("The renderer class is not correct",
renderer instanceof TemplateAttributeRenderer);
- verify(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ verify(container, attributeEvaluatorFactory, rendererFactory);
}
/**
@@ -269,18 +259,15 @@
*/
public void testCreateDefinitionAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContextFactory requestContextFactory = createMock(TilesRequestContextFactory.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
- replay(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ replay(container, attributeEvaluatorFactory, rendererFactory);
AttributeRenderer renderer = factory.createDefinitionAttributeRenderer(
rendererFactory, applicationContext, container,
attributeEvaluatorFactory);
assertTrue("The renderer class is not correct",
renderer instanceof DefinitionAttributeRenderer);
- verify(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory);
+ verify(container, attributeEvaluatorFactory, rendererFactory);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java Wed Dec 16 20:51:50 2009
@@ -30,7 +30,6 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
@@ -56,18 +55,6 @@
/**
* Tests
- * {@link AbstractBaseAttributeRenderer#setApplicationContext(ApplicationContext)}.
- */
- public void testSetApplicationContext() {
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
- EasyMock.replay(applicationContext);
- renderer.setApplicationContext(applicationContext);
- assertNotNull("The application context is null", renderer.applicationContext);
- }
-
- /**
- * Tests
* {@link AbstractBaseAttributeRenderer#render(Attribute, Request)}.
*
* @throws IOException If something goes wrong during rendition.
@@ -75,13 +62,10 @@
public void testRender() throws IOException {
Attribute attribute = new Attribute();
StringWriter writer = new StringWriter();
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
Request requestContext = EasyMock
.createMock(Request.class);
EasyMock.expect(requestContext.getWriter()).andReturn(writer);
- EasyMock.replay(applicationContext, requestContext);
- renderer.setApplicationContext(applicationContext);
+ EasyMock.replay(requestContext);
renderer.render(attribute, requestContext);
writer.close();
assertEquals("Wrongly written", "wrote", writer.toString());
@@ -92,16 +76,13 @@
* {@link AbstractBaseAttributeRenderer#isPermitted(Request, Set)}.
*/
public void testIsPermitted() {
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
Request requestContext = EasyMock
.createMock(Request.class);
EasyMock.expect(requestContext.isUserInRole("first")).andReturn(
Boolean.TRUE).anyTimes();
EasyMock.expect(requestContext.isUserInRole("second")).andReturn(
Boolean.FALSE).anyTimes();
- EasyMock.replay(applicationContext, requestContext);
- renderer.setApplicationContext(applicationContext);
+ EasyMock.replay(requestContext);
Set<String> roles = new HashSet<String>();
roles.add("first");
assertTrue("The role is not permitted", renderer.isPermitted(
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java Wed Dec 16 20:51:50 2009
@@ -105,7 +105,5 @@
DefinitionAttributeRenderer renderer = new DefinitionAttributeRenderer();
rendererFactory.initializeRenderer(renderer);
assertNotNull("The container is null", renderer.container);
- assertNotNull("The application context is null",
- renderer.applicationContext);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRendererTest.java Wed Dec 16 20:51:50 2009
@@ -30,7 +30,6 @@
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
import org.junit.Before;
@@ -91,8 +90,6 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("my.definition", (Expression) null,
null, "definition");
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
Request requestContext = EasyMock
.createMock(Request.class);
@@ -101,13 +98,12 @@
requestContext)).andReturn(Boolean.TRUE);
definitionRenderer.render(attribute, requestContext);
- replay(applicationContext, requestContext, stringRenderer,
- templateRenderer, definitionRenderer);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext, stringRenderer, templateRenderer,
+ definitionRenderer);
renderer.render(attribute, requestContext);
writer.close();
- verify(applicationContext, requestContext, stringRenderer,
- templateRenderer, definitionRenderer);
+ verify(requestContext, stringRenderer, templateRenderer,
+ definitionRenderer);
}
/**
@@ -121,8 +117,6 @@
public void testWriteString() throws IOException {
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
Request requestContext = EasyMock
.createMock(Request.class);
expect(
@@ -136,12 +130,11 @@
requestContext)).andReturn(Boolean.TRUE);
stringRenderer.render(attribute, requestContext);
- replay(applicationContext, requestContext, stringRenderer,
- templateRenderer, definitionRenderer);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext, stringRenderer, templateRenderer,
+ definitionRenderer);
renderer.render(attribute, requestContext);
- verify(applicationContext, requestContext, stringRenderer,
- templateRenderer, definitionRenderer);
+ verify(requestContext, stringRenderer, templateRenderer,
+ definitionRenderer);
}
/**
@@ -156,8 +149,6 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
Request requestContext = EasyMock
.createMock(Request.class);
templateRenderer.render(attribute, requestContext);
@@ -168,12 +159,11 @@
templateRenderer.isRenderable("/myTemplate.jsp", attribute,
requestContext)).andReturn(Boolean.TRUE);
- replay(applicationContext, requestContext, stringRenderer,
- templateRenderer, definitionRenderer);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext, stringRenderer, templateRenderer,
+ definitionRenderer);
renderer.render(attribute, requestContext);
writer.close();
- verify(applicationContext, requestContext, stringRenderer,
- templateRenderer, definitionRenderer);
+ verify(requestContext, stringRenderer, templateRenderer,
+ definitionRenderer);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java Wed Dec 16 20:51:50 2009
@@ -30,7 +30,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +48,7 @@
/** {@inheritDoc} */
@Before
- public void setUp() throws Exception {
+ public void setUp() {
renderer = new DefinitionAttributeRenderer();
renderer.setAttributeEvaluatorFactory(new BasicAttributeEvaluatorFactory(
new DirectAttributeEvaluator()));
@@ -65,15 +64,13 @@
public void testWrite() throws IOException {
Attribute attribute = new Attribute("my.definition", (Expression) null,
null, "definition");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Request requestContext = createMock(Request.class);
container.render("my.definition", requestContext);
- replay(applicationContext, requestContext, container);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext, container);
renderer.setContainer(container);
renderer.render(attribute, requestContext);
- verify(applicationContext, requestContext, container);
+ verify(requestContext, container);
}
/**
@@ -85,14 +82,12 @@
public void testIsRenderable() {
Attribute attribute = new Attribute("my.definition", (Expression) null,
null, "definition");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Request requestContext = createMock(Request.class);
expect(container.isValidDefinition("my.definition", requestContext)).andReturn(Boolean.TRUE);
- replay(applicationContext, requestContext, container);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext, container);
renderer.setContainer(container);
assertTrue(renderer.isRenderable("my.definition", attribute, requestContext));
- verify(applicationContext, requestContext, container);
+ verify(requestContext, container);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java Wed Dec 16 20:51:50 2009
@@ -30,7 +30,6 @@
import org.apache.tiles.Expression;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -66,15 +65,13 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
Request requestContext = createMock(Request.class);
expect(requestContext.getWriter()).andReturn(writer);
- replay(applicationContext, requestContext);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext);
renderer.render(attribute, requestContext);
writer.close();
assertEquals("Not written 'Result'", "Result", writer.toString());
- verify(applicationContext, requestContext);
+ verify(requestContext);
}
/**
@@ -87,11 +84,9 @@
public void testIsRenderable() {
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
Request requestContext = createMock(Request.class);
- replay(applicationContext, requestContext);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext);
assertTrue(renderer.isRenderable("Result", attribute, requestContext));
- verify(applicationContext, requestContext);
+ verify(requestContext);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java Wed Dec 16 20:51:50 2009
@@ -29,7 +29,6 @@
import org.apache.tiles.Expression;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -64,13 +63,11 @@
public void testWrite() throws IOException {
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
Request requestContext = createMock(Request.class);
requestContext.dispatch("/myTemplate.jsp");
- replay(applicationContext, requestContext);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext);
renderer.render(attribute, requestContext);
- verify(applicationContext, requestContext);
+ verify(requestContext);
}
/**
@@ -83,12 +80,10 @@
public void testIsRenderable() {
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
- ApplicationContext applicationContext = createMock(ApplicationContext.class);
Request requestContext = createMock(Request.class);
- replay(applicationContext, requestContext);
- renderer.setApplicationContext(applicationContext);
+ replay(requestContext);
assertTrue(renderer.isRenderable("/myTemplate.jsp", attribute,
requestContext));
- verify(applicationContext, requestContext);
+ verify(requestContext);
}
}
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=891422&r1=891421&r2=891422&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 Wed Dec 16 20:51:50 2009
@@ -168,7 +168,6 @@
.getRenderer(TEMPLATE_RENDERER_NAME));
retValue.addAttributeRenderer((TypeDetectingAttributeRenderer) rendererFactory
.getRenderer(STRING_RENDERER_NAME));
- retValue.setApplicationContext(applicationContext);
retValue.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return retValue;
}
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=891422&r1=891421&r2=891422&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 Wed Dec 16 20:51:50 2009
@@ -57,7 +57,6 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.apache.velocity.tools.view.VelocityView;
@@ -106,7 +105,6 @@
public void testRegisterAttributeRenderers() {
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
ServletTilesApplicationContext applicationContext = createMock(ServletTilesApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
TilesContainer container = createMock(TilesContainer.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
ServletContext servletContext = createMock(ServletContext.class);
@@ -150,11 +148,11 @@
expectLastCall().anyTimes();
expect(servletContext.getRealPath("/")).andReturn(null);
- replay(rendererFactory, applicationContext, contextFactory, container,
+ replay(rendererFactory, applicationContext, container,
attributeEvaluatorFactory, servletContext);
factory.registerAttributeRenderers(rendererFactory, applicationContext,
container, attributeEvaluatorFactory);
- verify(rendererFactory, applicationContext, contextFactory, container,
+ verify(rendererFactory, applicationContext, container,
attributeEvaluatorFactory, servletContext);
}
@@ -167,7 +165,6 @@
public void testCreateDefaultAttributeRenderer() {
ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContextFactory requestContextFactory = createMock(TilesRequestContextFactory.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
BasicRendererFactory rendererFactory = createMock(BasicRendererFactory.class);
AttributeRenderer stringRenderer = createMock(TypeDetectingAttributeRenderer.class);
@@ -182,15 +179,15 @@
expect(rendererFactory.getRenderer("velocity")).andReturn(velocityRenderer);
expect(rendererFactory.getRenderer("freemarker")).andReturn(freemarkerRenderer);
- replay(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory, applicationContext);
+ replay(container, attributeEvaluatorFactory, rendererFactory,
+ applicationContext);
AttributeRenderer renderer = factory.createDefaultAttributeRenderer(
rendererFactory, applicationContext, container,
attributeEvaluatorFactory);
assertTrue("The default renderer class is not correct",
renderer instanceof ChainedDelegateAttributeRenderer);
- verify(container, requestContextFactory, attributeEvaluatorFactory,
- rendererFactory, applicationContext);
+ verify(container, attributeEvaluatorFactory, rendererFactory,
+ applicationContext);
}
/**
@@ -202,7 +199,6 @@
@Test
public void testCreateAttributeEvaluatorFactory() {
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
LocaleResolver resolver = createMock(LocaleResolver.class);
ServletContext servletContext = createMock(ServletContext.class);
JspFactory jspFactory = createMock(JspFactory.class);
@@ -213,8 +209,8 @@
expect(jspFactory.getJspApplicationContext(servletContext)).andReturn(jspApplicationContext);
expect(jspApplicationContext.getExpressionFactory()).andReturn(expressionFactory);
- replay(applicationContext, contextFactory, resolver, servletContext,
- jspFactory, jspApplicationContext, expressionFactory);
+ replay(applicationContext, resolver, servletContext, jspFactory,
+ jspApplicationContext, expressionFactory);
JspFactory.setDefaultFactory(jspFactory);
AttributeEvaluatorFactory attributeEvaluatorFactory = factory
.createAttributeEvaluatorFactory(applicationContext,
@@ -223,8 +219,8 @@
assertNotNull(attributeEvaluatorFactory.getAttributeEvaluator("EL"));
assertNotNull(attributeEvaluatorFactory.getAttributeEvaluator("MVEL"));
assertNotNull(attributeEvaluatorFactory.getAttributeEvaluator("OGNL"));
- verify(applicationContext, contextFactory, resolver, servletContext,
- jspFactory, jspApplicationContext, expressionFactory);
+ verify(applicationContext, resolver, servletContext, jspFactory,
+ jspApplicationContext, expressionFactory);
}
/**
@@ -259,7 +255,6 @@
@Test
public void testGetSourceURLs() throws IOException {
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
URL url1 = new URL("file:///nonexistent/tiles.xml");
URL url2 = new URL("file:///nonexistent/tiles_it.xml");
@@ -275,12 +270,12 @@
expect(applicationContext.getResources("/WEB-INF/**/tiles*.xml")).andReturn(urls1);
expect(applicationContext.getResources("classpath*:META-INF/**/tiles*.xml")).andReturn(urls2);
- replay(applicationContext, contextFactory);
+ replay(applicationContext);
List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals(2, urls.size());
assertTrue(urls.contains(url1));
assertTrue(urls.contains(url3));
- verify(applicationContext, contextFactory);
+ verify(applicationContext);
}
/**
@@ -291,7 +286,6 @@
@Test
public void testTILES484first() throws IOException {
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
URL url3 = new URL("file:///nonexistent2/tiles.xml");
@@ -301,11 +295,11 @@
expect(applicationContext.getResources("/WEB-INF/**/tiles*.xml")).andReturn(null);
expect(applicationContext.getResources("classpath*:META-INF/**/tiles*.xml")).andReturn(urls2);
- replay(applicationContext, contextFactory);
+ replay(applicationContext);
List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals(1, urls.size());
assertTrue(urls.contains(url3));
- verify(applicationContext, contextFactory);
+ verify(applicationContext);
}
/**
@@ -316,7 +310,6 @@
@Test
public void testTILES484second() throws IOException {
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
URL url1 = new URL("file:///nonexistent/tiles.xml");
URL url2 = new URL("file:///nonexistent/tiles_it.xml");
@@ -328,11 +321,11 @@
expect(applicationContext.getResources("/WEB-INF/**/tiles*.xml")).andReturn(urls1);
expect(applicationContext.getResources("classpath*:META-INF/**/tiles*.xml")).andReturn(null);
- replay(applicationContext, contextFactory);
+ replay(applicationContext);
List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals(1, urls.size());
assertTrue(urls.contains(url1));
- verify(applicationContext, contextFactory);
+ verify(applicationContext);
}
/**
@@ -344,11 +337,10 @@
@Test
public void testCreateDefinitionsReader() {
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
- replay(applicationContext, contextFactory);
+ replay(applicationContext);
assertTrue(factory.createDefinitionsReader(applicationContext) instanceof CompatibilityDigesterDefinitionsReader);
- verify(applicationContext, contextFactory);
+ verify(applicationContext);
}
}
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=891422&r1=891421&r2=891422&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 Wed Dec 16 20:51:50 2009
@@ -33,10 +33,12 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
+import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.freemarker.servlet.TilesFreemarkerServlet;
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.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletTilesRequestContext;
@@ -53,7 +55,9 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class FreeMarkerAttributeRenderer extends AbstractTypeDetectingAttributeRenderer {
+public class FreeMarkerAttributeRenderer extends
+ AbstractTypeDetectingAttributeRenderer implements
+ TilesApplicationContextAware {
/**
* The servlet that is used to forward the request to.
@@ -66,6 +70,13 @@
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.
@@ -77,6 +88,16 @@
}
/**
+ * 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
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=891422&r1=891421&r2=891422&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java Wed Dec 16 20:51:50 2009
@@ -52,7 +52,6 @@
super.registerAttributeRenderers(rendererFactory, applicationContext, container,
attributeEvaluatorFactory);
ReverseStringAttributeRenderer renderer = new ReverseStringAttributeRenderer();
- renderer.setApplicationContext(applicationContext);
renderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
rendererFactory.registerRenderer("reversed", renderer);
}
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=891422&r1=891421&r2=891422&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 Wed Dec 16 20:51:50 2009
@@ -29,8 +29,10 @@
import javax.servlet.ServletContext;
import org.apache.tiles.Attribute;
+import org.apache.tiles.awareness.TilesApplicationContextAware;
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.servlet.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
@@ -50,7 +52,9 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class VelocityAttributeRenderer extends AbstractTypeDetectingAttributeRenderer {
+public class VelocityAttributeRenderer extends
+ AbstractTypeDetectingAttributeRenderer implements
+ TilesApplicationContextAware {
/**
* The VelocityView object to use.
@@ -63,6 +67,13 @@
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.
@@ -74,6 +85,16 @@
}
/**
+ * 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