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/07 20:17:16 UTC
svn commit: r833737 [2/4] - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/
tiles-request/tiles-request-api/src/main/java/org/
tiles-request/tiles-request-api/src/main/java/org/apache/
tiles-request/tiles-request-api/src/main/java/org/apache/...
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -25,15 +25,15 @@
import java.util.Set;
import org.apache.tiles.Attribute;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
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;
@@ -65,7 +65,7 @@
*
* @since 2.1.0
*/
- protected TilesApplicationContext applicationContext;
+ protected ApplicationContext applicationContext;
/**
* The attribute evaluator factory.
@@ -80,7 +80,7 @@
}
/** {@inheritDoc} */
- public void setApplicationContext(TilesApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
@@ -90,7 +90,7 @@
}
/** {@inheritDoc} */
- public void render(Attribute attribute, TilesRequestContext request) throws IOException {
+ public void render(Attribute attribute, Request request) throws IOException {
if (!isPermitted(request, attribute.getRoles())) {
if (log.isDebugEnabled()) {
log.debug("Access to attribute denied. User not in role '"
@@ -116,7 +116,7 @@
* @since 2.1.2
*/
public abstract void write(Object value, Attribute attribute,
- TilesRequestContext request)
+ Request request)
throws IOException;
/**
@@ -126,7 +126,7 @@
* @return The created Tiles request context.
* @since 2.1.0
*/
- protected TilesRequestContext getRequestContext(Object... requestItems) {
+ protected Request getRequestContext(Object... requestItems) {
return contextFactory.createRequestContext(applicationContext,
requestItems);
}
@@ -140,7 +140,7 @@
* @return <code>true</code> if the current user is in one of those roles.
* @since 2.1.0
*/
- protected boolean isPermitted(TilesRequestContext request, Set<String> roles) {
+ protected boolean isPermitted(Request request, Set<String> roles) {
if (roles == null || roles.isEmpty()) {
return true;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -22,14 +22,14 @@
package org.apache.tiles.renderer.impl;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
+import org.apache.tiles.request.Request;
/**
* Abstract implementation of {@link TypeDetectingAttributeRenderer} that
- * implements {@link #isRenderable(Attribute, TilesRequestContext)} to delegate
- * to {@link #isRenderable(Object, Attribute, TilesRequestContext)}.
+ * implements {@link #isRenderable(Attribute, Request)} to delegate
+ * to {@link #isRenderable(Object, Attribute, Request)}.
*
* @version $Rev$ $Date$
* @since 2.2.1
@@ -38,7 +38,7 @@
AbstractBaseAttributeRenderer implements TypeDetectingAttributeRenderer {
/** {@inheritDoc} */
- public boolean isRenderable(Attribute attribute, TilesRequestContext request) {
+ public boolean isRenderable(Attribute attribute, Request request) {
AttributeEvaluator evaluator = attributeEvaluatorFactory
.getAttributeEvaluator(attribute);
Object value = evaluator.evaluate(attribute, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java Sat Nov 7 19:17:09 2009
@@ -23,7 +23,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
@@ -34,6 +33,7 @@
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
+import org.apache.tiles.request.ApplicationContext;
/**
* Basic renderer factory implementation.
@@ -80,7 +80,7 @@
*
* @since 2.1.0
*/
- protected TilesApplicationContext applicationContext;
+ protected ApplicationContext applicationContext;
/**
* The Tiles container.
@@ -184,7 +184,7 @@
}
/** {@inheritDoc} */
- public void setApplicationContext(TilesApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/ChainedDelegateAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -25,9 +25,9 @@
import java.util.List;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.renderer.RendererException;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
+import org.apache.tiles.request.Request;
/**
* Renders an attribute that has no associated renderer using delegation to
@@ -65,7 +65,7 @@
/** {@inheritDoc} */
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request)
+ Request request)
throws IOException {
if (value == null) {
throw new NullPointerException("The attribute value is null");
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/DefinitionAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -25,7 +25,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesContainerAware;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Renders an attribute that contains a reference to a definition.
@@ -51,14 +51,14 @@
/** {@inheritDoc} */
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request)
+ Request request)
throws IOException {
container.render(value.toString(), request.getRequestObjects());
}
/** {@inheritDoc} */
public boolean isRenderable(Object value, Attribute attribute,
- TilesRequestContext request) {
+ Request request) {
if (value instanceof String) {
return container.isValidDefinition((String) value, request
.getRequestObjects());
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -23,7 +23,7 @@
import java.io.IOException;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Renders an attribute that contains a string.
@@ -36,14 +36,14 @@
/** {@inheritDoc} */
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request)
+ Request request)
throws IOException {
request.getWriter().write(value.toString());
}
/** {@inheritDoc} */
public boolean isRenderable(Object value, Attribute attribute,
- TilesRequestContext request) {
+ Request request) {
return value instanceof String;
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -23,8 +23,8 @@
import java.io.IOException;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.impl.InvalidTemplateException;
+import org.apache.tiles.request.Request;
/**
* Renders an attribute that contains a reference to a template.
@@ -37,7 +37,7 @@
/** {@inheritDoc} */
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request)
+ Request request)
throws IOException {
if (value != null) {
if (value instanceof String) {
@@ -54,7 +54,7 @@
/** {@inheritDoc} */
public boolean isRenderable(Object value, Attribute attribute,
- TilesRequestContext request) {
+ Request request) {
if (value instanceof String) {
return ((String) value).startsWith("/");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java Sat Nov 7 19:17:09 2009
@@ -21,18 +21,18 @@
package org.apache.tiles.startup;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import org.apache.tiles.request.ApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Default Tiles initialization delegate implementation under a servlet
* environment. It uses init parameters to create the
- * {@link TilesApplicationContext} and the {@link TilesContainer}.
+ * {@link ApplicationContext} and the {@link TilesContainer}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -56,7 +56,7 @@
/**
* The initialized application context.
*/
- private TilesApplicationContext applicationContext;
+ private ApplicationContext applicationContext;
/**
* The initialized container.
@@ -64,7 +64,7 @@
private TilesContainer container;
/** {@inheritDoc} */
- public void initialize(TilesApplicationContext applicationContext) {
+ public void initialize(ApplicationContext applicationContext) {
this.applicationContext = createTilesApplicationContext(applicationContext);
String key = getContainerKey(this.applicationContext);
container = createContainer(this.applicationContext);
@@ -85,7 +85,7 @@
* Creates the Tiles application context, to be used across all the
* Tiles-based application. If you override this class, please override this
* method or
- * {@link #createAndInitializeTilesApplicationContextFactory(TilesApplicationContext)}
+ * {@link #createAndInitializeTilesApplicationContextFactory(ApplicationContext)}
* .<br>
* This implementation returns the preliminary context passed as a parameter
*
@@ -93,8 +93,8 @@
* @return The Tiles application context.
* @since 2.2.0
*/
- protected TilesApplicationContext createTilesApplicationContext(
- TilesApplicationContext preliminaryContext) {
+ protected ApplicationContext createTilesApplicationContext(
+ ApplicationContext preliminaryContext) {
return preliminaryContext;
}
@@ -107,31 +107,31 @@
* @return The container key.
* @since 2.2.0
*/
- protected String getContainerKey(TilesApplicationContext applicationContext) {
+ protected String getContainerKey(ApplicationContext applicationContext) {
return null;
}
/**
* Creates a Tiles container. If you override this class, please override
- * this method or {@link #createContainerFactory(TilesApplicationContext)}.
+ * this method or {@link #createContainerFactory(ApplicationContext)}.
*
* @param context The servlet context to use.
* @return The created container.
* @since 2.2.0
*/
- protected TilesContainer createContainer(TilesApplicationContext context) {
+ protected TilesContainer createContainer(ApplicationContext context) {
AbstractTilesContainerFactory factory = createContainerFactory(context);
return factory.createContainer(context);
}
/**
* Creates a Tiles container factory. If you override this class, please
- * override this method or {@link #createContainer(TilesApplicationContext)}.
+ * override this method or {@link #createContainer(ApplicationContext)}.
*
* @param context The servlet context to use.
* @return The created container factory.
* @since 2.2.0
*/
protected abstract AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context);
+ ApplicationContext context);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java Sat Nov 7 19:17:09 2009
@@ -21,9 +21,9 @@
package org.apache.tiles.startup;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.factory.BasicTilesContainerFactory;
+import org.apache.tiles.request.ApplicationContext;
/**
* Loads Tiles with the default settings.
@@ -36,7 +36,7 @@
/** {@inheritDoc} */
@Override
protected AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context) {
+ ApplicationContext context) {
return new BasicTilesContainerFactory();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java Sat Nov 7 19:17:09 2009
@@ -20,7 +20,7 @@
*/
package org.apache.tiles.startup;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
/**
* Tiles initialization delegate. It initializes Tiles container(s) and the
@@ -38,7 +38,7 @@
* under your current environment, like ServletTilesApplicationContext or
* PortletTilesApplicationContext.
*/
- void initialize(TilesApplicationContext preliminaryContext);
+ void initialize(ApplicationContext preliminaryContext);
/**
* Destroys the Tiles container.
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/ChainedTilesRequestContextFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -25,8 +25,9 @@
import junit.framework.TestCase;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
/**
@@ -39,19 +40,19 @@
/**
* The Tiles application context.
*/
- private TilesApplicationContext appContext;
+ private ApplicationContext appContext;
/**
* The request context.
*/
- private TilesRequestContext requestContext;
+ private Request requestContext;
/** {@inheritDoc} */
@Override
protected void setUp() throws Exception {
super.setUp();
- appContext = EasyMock.createMock(TilesApplicationContext.class);
- requestContext = EasyMock.createMock(TilesRequestContext.class);
+ appContext = EasyMock.createMock(ApplicationContext.class);
+ requestContext = EasyMock.createMock(Request.class);
EasyMock.replay(appContext);
}
@@ -65,7 +66,7 @@
repFactory.setRequestContextFactory(factory);
factories.add(repFactory);
factory.setFactories(factories);
- TilesRequestContext context = factory.createRequestContext(appContext, requestContext);
+ Request context = factory.createRequestContext(appContext, requestContext);
assertNotNull("The request context is not correct",
context == requestContext);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java Sat Nov 7 19:17:09 2009
@@ -24,6 +24,7 @@
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
+import org.apache.tiles.request.Request;
import org.junit.Test;
/**
@@ -35,11 +36,11 @@
public class TilesRequestContextHolderTest {
/**
- * Test method for {@link TilesRequestContextHolder#setTilesRequestContext(TilesRequestContext)}.
+ * Test method for {@link TilesRequestContextHolder#setTilesRequestContext(Request)}.
*/
@Test
public void testSetTilesRequestContext() {
- TilesRequestContext request = createMock(TilesRequestContext.class);
+ Request request = createMock(Request.class);
replay(request);
TilesRequestContextHolder holder = new TilesRequestContextHolder();
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextTest.java Sat Nov 7 19:17:09 2009
@@ -21,7 +21,8 @@
package org.apache.tiles.context.enhanced;
import junit.framework.TestCase;
-import org.apache.tiles.TilesApplicationContext;
+
+import org.apache.tiles.request.ApplicationContext;
import org.easymock.EasyMock;
import java.io.IOException;
@@ -45,7 +46,7 @@
/**
* The root Tiles application context.
*/
- private TilesApplicationContext root;
+ private ApplicationContext root;
/**
* The enhanced Tiles application context.
@@ -55,7 +56,7 @@
/** {@inheritDoc} */
@Override
public void setUp() {
- root = EasyMock.createMock(TilesApplicationContext.class);
+ root = EasyMock.createMock(ApplicationContext.class);
context = new EnhancedTilesApplicationContext(root);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -30,10 +30,10 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.junit.Test;
/**
@@ -44,15 +44,15 @@
public class LocaleDefinitionsFactoryTest {
/**
- * Test method for {@link LocaleDefinitionsFactory#getDefinition(String, TilesRequestContext)}.
+ * Test method for {@link LocaleDefinitionsFactory#getDefinition(String, Request)}.
*/
@SuppressWarnings("unchecked")
@Test
public void testGetDefinition() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
DefinitionDAO<Locale> dao = createMock(DefinitionDAO.class);
LocaleResolver localeResolver = createMock(LocaleResolver.class);
- TilesRequestContext request = createMock(TilesRequestContext.class);
+ Request request = createMock(Request.class);
Attribute templateAttribute = Attribute.createTemplateAttribute("/mytemplate.jsp");
Definition definition = new Definition("myDefinition", null, null);
definition.setExtends("anotherDefinition");
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java Sat Nov 7 19:17:09 2009
@@ -28,15 +28,15 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Creates a TilesApplicationContext that contains only a Locale.
*
* @version $Rev$ $Date$
*/
-public class MockOnlyLocaleTilesContext implements TilesRequestContext {
+public class MockOnlyLocaleTilesContext implements Request {
/**
* The locale object.
@@ -55,7 +55,7 @@
* Returns the locale specified in the constructor.
*
* @return The locale of the request.
- * @see org.apache.tiles.context.TilesRequestContext#getRequestLocale()
+ * @see org.apache.tiles.request.Request#getRequestLocale()
*/
public Locale getRequestLocale() {
return locale;
@@ -125,7 +125,7 @@
}
/** {@inheritDoc} */
- public TilesApplicationContext getApplicationContext() {
+ public ApplicationContext getApplicationContext() {
return null;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -27,10 +27,10 @@
import java.util.Locale;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.junit.Test;
/**
@@ -41,16 +41,16 @@
public class UnresolvingLocaleDefinitionsFactoryTest {
/**
- * Test method for {@link UnresolvingLocaleDefinitionsFactory#getDefinition(String, TilesRequestContext)}.
+ * Test method for {@link UnresolvingLocaleDefinitionsFactory#getDefinition(String, Request)}.
*/
@SuppressWarnings("unchecked")
@Test
public void testGetDefinition() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
DefinitionDAO<Locale> dao = createMock(DefinitionDAO.class);
LocaleResolver localeResolver = createMock(LocaleResolver.class);
UnresolvingLocaleDefinitionsFactory factory = new UnresolvingLocaleDefinitionsFactory();
- TilesRequestContext request = createMock(TilesRequestContext.class);
+ Request request = createMock(Request.class);
Definition definition = createMock(Definition.class);
Locale locale = Locale.ITALY;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java Sat Nov 7 19:17:09 2009
@@ -44,9 +44,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.MockDefinitionsReader;
@@ -55,6 +53,8 @@
import org.apache.tiles.definition.pattern.BasicPatternDefinitionResolver;
import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
import org.apache.tiles.definition.pattern.wildcard.WildcardDefinitionPatternMatcherFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Tests {@link CachingLocaleUrlDefinitionDAO}.
@@ -104,7 +104,7 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
@@ -192,7 +192,7 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
@@ -331,10 +331,10 @@
}
/**
- * Tests {@link LocaleUrlDefinitionDAO#setApplicationContext(TilesApplicationContext)}.
+ * Tests {@link LocaleUrlDefinitionDAO#setApplicationContext(ApplicationContext)}.
*/
public void testSetApplicationContext() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
definitionDao.setApplicationContext(applicationContext);
assertEquals("The application context has not been set",
applicationContext, definitionDao.applicationContext);
@@ -352,7 +352,7 @@
"org/apache/tiles/config/defs2.xml");
URL url3 = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs3.xml");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
Set<URL> urlSet = new HashSet<URL>();
urlSet.add(url1);
expect(applicationContext.getResources("/WEB-INF/tiles.xml"))
@@ -371,7 +371,7 @@
definitionDao.sourceURLs);
reset(applicationContext);
- applicationContext = createMock(TilesApplicationContext.class);
+ applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
definitionDao.setReader(new MockDefinitionsReader());
@@ -414,7 +414,7 @@
urlPath = "file:/" + url.getPath();
}
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
((TilesApplicationContextAware) definitionDao)
.setApplicationContext(applicationContext);
@@ -457,7 +457,7 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG, urlPath);
- TilesRequestContext context = createMock(TilesRequestContext.class);
+ Request context = createMock(Request.class);
expect(context.getSessionScope()).andReturn(
new HashMap<String, Object>()).anyTimes();
expect(context.getRequestLocale()).andReturn(null).anyTimes();
@@ -508,7 +508,7 @@
URL url = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs-wildcard.xml");
definitionDao.addSourceURL(url);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
((TilesApplicationContextAware) definitionDao)
.setApplicationContext(applicationContext);
@@ -558,7 +558,7 @@
URL url = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/tiles-defs-2.1.xml");
definitionDao.addSourceURL(url);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
definitionDao.setReader(new DigesterDefinitionsReader());
replay(applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java Sat Nov 7 19:17:09 2009
@@ -42,14 +42,14 @@
import junit.framework.TestCase;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.MockDefinitionsReader;
import org.apache.tiles.definition.RefreshMonitor;
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Tests {@link LocaleUrlDefinitionDAO}.
@@ -93,7 +93,7 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
@@ -181,7 +181,7 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
@@ -320,10 +320,10 @@
}
/**
- * Tests {@link LocaleUrlDefinitionDAO#setApplicationContext(TilesApplicationContext)}.
+ * Tests {@link LocaleUrlDefinitionDAO#setApplicationContext(ApplicationContext)}.
*/
public void testSetApplicationContext() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
definitionDao.setApplicationContext(applicationContext);
assertEquals("The application context has not been set",
applicationContext, definitionDao.applicationContext);
@@ -341,7 +341,7 @@
"org/apache/tiles/config/defs2.xml");
URL url3 = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs3.xml");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
Set<URL> urlSet = new HashSet<URL>();
urlSet.add(url1);
expect(applicationContext.getResources("/WEB-INF/tiles.xml"))
@@ -360,7 +360,7 @@
definitionDao.sourceURLs);
reset(applicationContext);
- applicationContext = createMock(TilesApplicationContext.class);
+ applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
definitionDao.setReader(new MockDefinitionsReader());
@@ -403,7 +403,7 @@
urlPath = "file:/" + url.getPath();
}
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
((TilesApplicationContextAware) definitionDao)
.setApplicationContext(applicationContext);
@@ -446,7 +446,7 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG, urlPath);
- TilesRequestContext context = createMock(TilesRequestContext.class);
+ Request context = createMock(Request.class);
expect(context.getSessionScope()).andReturn(
new HashMap<String, Object>()).anyTimes();
expect(context.getRequestLocale()).andReturn(null).anyTimes();
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java Sat Nov 7 19:17:09 2009
@@ -44,9 +44,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.MockDefinitionsReader;
@@ -55,6 +53,8 @@
import org.apache.tiles.definition.pattern.BasicPatternDefinitionResolver;
import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
import org.apache.tiles.definition.pattern.wildcard.WildcardDefinitionPatternMatcherFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Tests {@link ResolvingLocaleUrlDefinitionDAO}.
@@ -109,7 +109,7 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
@@ -202,7 +202,7 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
definitionDao.setApplicationContext(applicationContext);
@@ -347,10 +347,10 @@
}
/**
- * Tests {@link LocaleUrlDefinitionDAO#setApplicationContext(TilesApplicationContext)}.
+ * Tests {@link LocaleUrlDefinitionDAO#setApplicationContext(ApplicationContext)}.
*/
public void testSetApplicationContext() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
definitionDao.setApplicationContext(applicationContext);
assertEquals("The application context has not been set",
applicationContext, definitionDao.applicationContext);
@@ -368,7 +368,7 @@
"org/apache/tiles/config/defs2.xml");
URL url3 = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs3.xml");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
Set<URL> urlSet = new HashSet<URL>();
urlSet.add(url1);
expect(applicationContext.getResources("/WEB-INF/tiles.xml"))
@@ -388,7 +388,7 @@
definitionDao.sourceURLs);
reset(applicationContext);
- applicationContext = createMock(TilesApplicationContext.class);
+ applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
params.clear();
params.put(DefinitionsFactory.READER_IMPL_PROPERTY,
@@ -438,7 +438,7 @@
urlPath = "file:/" + url.getPath();
}
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
((TilesApplicationContextAware) definitionDao)
.setApplicationContext(applicationContext);
@@ -481,7 +481,7 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG, urlPath);
- TilesRequestContext context = createMock(TilesRequestContext.class);
+ Request context = createMock(Request.class);
expect(context.getSessionScope()).andReturn(
new HashMap<String, Object>()).anyTimes();
expect(context.getRequestLocale()).andReturn(null).anyTimes();
@@ -532,7 +532,7 @@
URL url = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs-wildcard.xml");
definitionDao.addSourceURL(url);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
replay(applicationContext);
((TilesApplicationContextAware) definitionDao)
.setApplicationContext(applicationContext);
@@ -586,7 +586,7 @@
URL url = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/tiles-defs-2.1.xml");
definitionDao.addSourceURL(url);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
definitionDao.setReader(new DigesterDefinitionsReader());
replay(applicationContext);
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -29,7 +29,6 @@
import junit.framework.TestCase;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.context.TilesRequestContextFactory;
@@ -53,6 +52,7 @@
import org.apache.tiles.renderer.impl.DefinitionAttributeRenderer;
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
+import org.apache.tiles.request.ApplicationContext;
import org.easymock.EasyMock;
/**
@@ -70,7 +70,7 @@
/**
* The context object.
*/
- private TilesApplicationContext applicationContext;
+ private ApplicationContext applicationContext;
/**
* The URL to load.
@@ -80,7 +80,7 @@
/** {@inheritDoc} */
@Override
protected void setUp() throws Exception {
- applicationContext = EasyMock.createMock(TilesApplicationContext.class);
+ applicationContext = EasyMock.createMock(ApplicationContext.class);
url = getClass().getResource("/org/apache/tiles/config/tiles-defs.xml");
EasyMock.expect(applicationContext.getResource("/WEB-INF/tiles.xml")).andReturn(url);
EasyMock.replay(applicationContext);
@@ -88,7 +88,7 @@
}
/**
- * Tests {@link BasicTilesContainerFactory#createContainer(TilesApplicationContext)}.
+ * Tests {@link BasicTilesContainerFactory#createContainer(ApplicationContext)}.
*/
public void testCreateContainer() {
TilesContainer container = factory.createContainer(applicationContext);
@@ -97,7 +97,7 @@
}
/**
- * Tests {@link BasicTilesContainerFactory#createRequestContextFactory(TilesApplicationContext)}.
+ * Tests {@link BasicTilesContainerFactory#createRequestContextFactory(ApplicationContext)}.
*/
public void testCreateRequestContextFactory() {
TilesRequestContextFactory contextFactory = factory
@@ -108,7 +108,7 @@
/**
* Tests {@link BasicTilesContainerFactory#createDefinitionsFactory(
- * TilesApplicationContext, TilesRequestContextFactory, LocaleResolver)}.
+ * ApplicationContext, TilesRequestContextFactory, LocaleResolver)}.
*/
public void testCreateDefinitionsFactory() {
TilesRequestContextFactory requestContextFactory = factory
@@ -123,7 +123,7 @@
/**
* Tests {@link BasicTilesContainerFactory#createLocaleResolver(
- * TilesApplicationContext, TilesRequestContextFactory)}.
+ * ApplicationContext, TilesRequestContextFactory)}.
*/
public void testCreateLocaleResolver() {
TilesRequestContextFactory requestContextFactory = factory
@@ -136,7 +136,7 @@
/**
* Tests {@link BasicTilesContainerFactory#createDefinitionsReader(
- * TilesApplicationContext, TilesRequestContextFactory)}.
+ * ApplicationContext, TilesRequestContextFactory)}.
*/
public void testCreateDefinitionsReader() {
TilesRequestContextFactory requestContextFactory = factory
@@ -149,7 +149,7 @@
/**
* Tests
- * {@link BasicTilesContainerFactory#getSourceURLs(TilesApplicationContext, TilesRequestContextFactory)}.
+ * {@link BasicTilesContainerFactory#getSourceURLs(ApplicationContext, TilesRequestContextFactory)}.
*/
public void testGetSourceURLs() {
TilesRequestContextFactory requestContextFactory = factory
@@ -162,7 +162,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createAttributeEvaluatorFactory(
- * TilesApplicationContext, TilesRequestContextFactory, LocaleResolver)}.
+ * ApplicationContext, TilesRequestContextFactory, LocaleResolver)}.
*/
public void testCreateAttributeEvaluatorFactory() {
TilesRequestContextFactory requestContextFactory = factory
@@ -179,7 +179,7 @@
/**
* Tests
- * {@link BasicTilesContainerFactory#createPreparerFactory(TilesApplicationContext, TilesRequestContextFactory)}.
+ * {@link BasicTilesContainerFactory#createPreparerFactory(ApplicationContext, TilesRequestContextFactory)}.
*/
public void testCreatePreparerFactory() {
TilesRequestContextFactory requestContextFactory = factory
@@ -192,7 +192,7 @@
/**
* Tests {@link BasicTilesContainerFactory#createRendererFactory(
- * TilesApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateRendererFactory() {
TilesContainer container = factory.createContainer(applicationContext);
@@ -225,7 +225,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createDefaultAttributeRenderer(BasicRendererFactory,
- * TilesApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateDefaultAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -254,7 +254,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createStringAttributeRenderer(BasicRendererFactory,
- * TilesApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateStringAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -276,7 +276,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createTemplateAttributeRenderer(BasicRendererFactory,
- * TilesApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateTemplateAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -298,7 +298,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createDefinitionAttributeRenderer(BasicRendererFactory,
- * TilesApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateDefinitionAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java Sat Nov 7 19:17:09 2009
@@ -29,14 +29,14 @@
import junit.framework.TestCase;
import org.apache.tiles.Attribute;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.factory.BasicTilesContainerFactory;
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,8 +66,8 @@
/** {@inheritDoc} */
@Override
public void setUp() {
- TilesApplicationContext context = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext context = EasyMock
+ .createMock(ApplicationContext.class);
URL url = getClass().getResource("/org/apache/tiles/factory/test-defs.xml");
try {
@@ -100,7 +100,7 @@
*/
public void testObjectAttribute() throws IOException {
Attribute attribute = new Attribute();
- TilesRequestContext request = EasyMock.createMock(TilesRequestContext.class);
+ Request request = EasyMock.createMock(Request.class);
EasyMock.replay(request);
boolean exceptionFound = false;
@@ -122,7 +122,7 @@
* @throws IOException If a problem arises during rendering or writing in the writer.
*/
public void testAttributeCredentials() throws IOException {
- TilesRequestContext request = EasyMock.createMock(TilesRequestContext.class);
+ Request request = EasyMock.createMock(Request.class);
EasyMock.expect(request.isUserInRole("myrole")).andReturn(Boolean.TRUE);
StringWriter writer = new StringWriter();
EasyMock.expect(request.getWriter()).andReturn(writer);
@@ -134,7 +134,7 @@
assertEquals("The attribute should have been rendered",
"This is the value", writer.toString());
EasyMock.reset(request);
- request = EasyMock.createMock(TilesRequestContext.class);
+ request = EasyMock.createMock(Request.class);
EasyMock.expect(request.isUserInRole("myrole")).andReturn(Boolean.FALSE);
EasyMock.replay(request);
writer = new StringWriter();
@@ -148,7 +148,7 @@
* Tests {@link BasicTilesContainer#evaluate(Attribute, Object...)}.
*/
public void testEvaluate() {
- TilesRequestContext request = EasyMock.createMock(TilesRequestContext.class);
+ Request request = EasyMock.createMock(Request.class);
EasyMock.replay(request);
Attribute attribute = new Attribute((Object) "This is the value");
Object value = container.evaluate(attribute, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java Sat Nov 7 19:17:09 2009
@@ -22,15 +22,15 @@
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* "Repeats" (i.e. returns back) the context as a
- * {@link TilesApplicationContext}, or the request as a
- * {@link TilesRequestContext}.
+ * {@link ApplicationContext}, or the request as a
+ * {@link Request}.
*
* @version $Rev$ $Date$
*/
@@ -49,14 +49,14 @@
}
/** {@inheritDoc} */
- public TilesRequestContext createRequestContext(
- TilesApplicationContext context, Object... requestItems) {
+ public Request createRequestContext(
+ ApplicationContext context, Object... requestItems) {
if (parent == null) {
throw new RuntimeException("The parent is null");
}
- TilesRequestContext retValue = null;
+ Request retValue = null;
if (requestItems.length > 0) {
- retValue = (TilesRequestContext) requestItems[0];
+ retValue = (Request) requestItems[0];
}
return retValue;
}
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -28,11 +28,11 @@
import junit.framework.TestCase;
import org.apache.tiles.Attribute;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
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;
/**
@@ -69,11 +69,11 @@
/**
* Tests
- * {@link AbstractBaseAttributeRenderer#setApplicationContext(TilesApplicationContext)}.
+ * {@link AbstractBaseAttributeRenderer#setApplicationContext(ApplicationContext)}.
*/
public void testSetApplicationContext() {
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.replay(applicationContext);
renderer.setApplicationContext(applicationContext);
assertNotNull("The application context is null", renderer.applicationContext);
@@ -81,19 +81,19 @@
/**
* Tests
- * {@link AbstractBaseAttributeRenderer#render(Attribute, TilesRequestContext)}.
+ * {@link AbstractBaseAttributeRenderer#render(Attribute, Request)}.
*
* @throws IOException If something goes wrong during rendition.
*/
public void testRender() throws IOException {
Attribute attribute = new Attribute();
StringWriter writer = new StringWriter();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = EasyMock
- .createMock(TilesRequestContext.class);
+ Request requestContext = EasyMock
+ .createMock(Request.class);
EasyMock.expect(contextFactory.createRequestContext(applicationContext))
.andReturn(requestContext);
EasyMock.expect(requestContext.getWriter()).andReturn(writer);
@@ -109,12 +109,12 @@
* Tests {@link AbstractBaseAttributeRenderer#getRequestContext(Object...)}.
*/
public void testGetRequestContext() {
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = EasyMock
- .createMock(TilesRequestContext.class);
+ Request requestContext = EasyMock
+ .createMock(Request.class);
EasyMock.expect(contextFactory.createRequestContext(applicationContext))
.andReturn(requestContext);
EasyMock.replay(applicationContext, contextFactory, requestContext);
@@ -126,15 +126,15 @@
/**
* Tests
- * {@link AbstractBaseAttributeRenderer#isPermitted(TilesRequestContext, Set)}.
+ * {@link AbstractBaseAttributeRenderer#isPermitted(Request, Set)}.
*/
public void testIsPermitted() {
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = EasyMock
- .createMock(TilesRequestContext.class);
+ Request requestContext = EasyMock
+ .createMock(Request.class);
EasyMock.expect(contextFactory.createRequestContext(applicationContext))
.andReturn(requestContext);
EasyMock.expect(requestContext.isUserInRole("first")).andReturn(
@@ -162,7 +162,7 @@
/** {@inheritDoc} */
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request)
+ Request request)
throws IOException {
request.getWriter().write("wrote");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractTypeDetectingAttributeRendererTest.java Sat Nov 7 19:17:09 2009
@@ -28,9 +28,9 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
+import org.apache.tiles.request.Request;
import org.junit.Test;
/**
@@ -42,14 +42,14 @@
/**
* Tests
- * {@link AbstractTypeDetectingAttributeRenderer#isRenderable(Attribute, TilesRequestContext)}
+ * {@link AbstractTypeDetectingAttributeRenderer#isRenderable(Attribute, Request)}
* .
*/
@Test
public void testIsRenderable() {
AttributeEvaluatorFactory evaluatorFactory = createMock(AttributeEvaluatorFactory.class);
AttributeEvaluator evaluator = createMock(AttributeEvaluator.class);
- TilesRequestContext request = createMock(TilesRequestContext.class);
+ Request request = createMock(Request.class);
Attribute attribute = new Attribute("value", new Expression(
"expression"), "role", "rendererName");
@@ -61,13 +61,13 @@
AbstractTypeDetectingAttributeRenderer renderer = new AbstractTypeDetectingAttributeRenderer() {
public boolean isRenderable(Object value, Attribute attribute,
- TilesRequestContext request) {
+ Request request) {
return "myValue".equals(value);
}
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request) throws IOException {
+ Request request) throws IOException {
// Does nothing.
}
};
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -23,10 +23,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.renderer.AttributeRenderer;
+import org.apache.tiles.request.ApplicationContext;
import org.easymock.EasyMock;
import junit.framework.TestCase;
@@ -48,8 +48,8 @@
@Override
public void setUp() throws Exception {
rendererFactory = new BasicRendererFactory();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
TilesContainer container = EasyMock.createMock(TilesContainer.class);
@@ -103,7 +103,7 @@
/**
* Tests
- * {@link BasicRendererFactory#setApplicationContext(TilesApplicationContext)}.
+ * {@link BasicRendererFactory#setApplicationContext(ApplicationContext)}.
*/
public void testSetApplicationContext() {
assertNotNull("The application context is null",
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -27,12 +27,12 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
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;
import org.junit.Test;
@@ -82,7 +82,7 @@
/**
* Tests
- * {@link ChainedDelegateAttributeRenderer#render(Attribute, TilesRequestContext)}
+ * {@link ChainedDelegateAttributeRenderer#render(Attribute, Request)}
* writing a definition.
*
* @throws IOException If something goes wrong during rendition.
@@ -92,12 +92,12 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("my.definition", (Expression) null,
null, "definition");
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = EasyMock
- .createMock(TilesRequestContext.class);
+ Request requestContext = EasyMock
+ .createMock(Request.class);
expect(
definitionRenderer.isRenderable("my.definition", attribute,
@@ -116,7 +116,7 @@
/**
* Tests
- * {@link ChainedDelegateAttributeRenderer#render(Attribute, TilesRequestContext)}
+ * {@link ChainedDelegateAttributeRenderer#render(Attribute, Request)}
* writing a string.
*
* @throws IOException If something goes wrong during rendition.
@@ -125,12 +125,12 @@
public void testWriteString() throws IOException {
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = EasyMock
- .createMock(TilesRequestContext.class);
+ Request requestContext = EasyMock
+ .createMock(Request.class);
expect(
definitionRenderer.isRenderable("Result", attribute,
requestContext)).andReturn(Boolean.FALSE);
@@ -153,7 +153,7 @@
/**
* Tests
- * {@link ChainedDelegateAttributeRenderer#render(Attribute, TilesRequestContext)}
+ * {@link ChainedDelegateAttributeRenderer#render(Attribute, Request)}
* writing a template.
*
* @throws IOException If something goes wrong during rendition.
@@ -163,12 +163,12 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = EasyMock
- .createMock(TilesRequestContext.class);
+ Request requestContext = EasyMock
+ .createMock(Request.class);
templateRenderer.render(attribute, requestContext);
expect(
definitionRenderer.isRenderable("/myTemplate.jsp", attribute,
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -27,12 +27,12 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
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;
@@ -58,7 +58,7 @@
/**
* Tests
- * {@link StringAttributeRenderer#write(Object, Attribute, TilesRequestContext)}.
+ * {@link StringAttributeRenderer#write(Object, Attribute, Request)}.
*
* @throws IOException If something goes wrong during rendition.
*/
@@ -66,10 +66,10 @@
public void testWrite() throws IOException {
Attribute attribute = new Attribute("my.definition", (Expression) null,
null, "definition");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContext requestContext = createMock(TilesRequestContext.class);
+ Request requestContext = createMock(Request.class);
Object[] requestObjects = new Object[0];
expect(requestContext.getRequestObjects()).andReturn(requestObjects);
container.render("my.definition");
@@ -85,17 +85,17 @@
/**
* Tests
- * {@link DefinitionAttributeRenderer#isRenderable(Object, Attribute, TilesRequestContext)}
+ * {@link DefinitionAttributeRenderer#isRenderable(Object, Attribute, Request)}
* .
*/
@Test
public void testIsRenderable() {
Attribute attribute = new Attribute("my.definition", (Expression) null,
null, "definition");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
TilesContainer container = createMock(TilesContainer.class);
- TilesRequestContext requestContext = createMock(TilesRequestContext.class);
+ Request requestContext = createMock(Request.class);
Object[] requestObjects = new Object[0];
expect(requestContext.getRequestObjects()).andReturn(requestObjects);
expect(container.isValidDefinition("my.definition", requestObjects)).andReturn(Boolean.TRUE);
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -28,11 +28,11 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
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;
@@ -58,7 +58,7 @@
/**
* Tests
- * {@link StringAttributeRenderer#write(Object, Attribute, TilesRequestContext)}.
+ * {@link StringAttributeRenderer#write(Object, Attribute, Request)}.
*
* @throws IOException If something goes wrong during rendition.
*/
@@ -67,9 +67,9 @@
StringWriter writer = new StringWriter();
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = createMock(TilesRequestContext.class);
+ Request requestContext = createMock(Request.class);
expect(requestContext.getWriter()).andReturn(writer);
replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
@@ -82,7 +82,7 @@
/**
* Tests
- * {@link StringAttributeRenderer#isRenderable(Object, Attribute, TilesRequestContext)}.
+ * {@link StringAttributeRenderer#isRenderable(Object, Attribute, Request)}.
*
* @throws IOException If something goes wrong.
*/
@@ -90,9 +90,9 @@
public void testIsRenderable() throws IOException {
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = createMock(TilesRequestContext.class);
+ Request requestContext = createMock(Request.class);
replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
renderer.setRequestContextFactory(contextFactory);
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=833737&r1=833736&r2=833737&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 Sat Nov 7 19:17:09 2009
@@ -27,11 +27,11 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
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;
@@ -57,7 +57,7 @@
/**
* Tests
- * {@link StringAttributeRenderer#write(Object, Attribute, TilesRequestContext)}.
+ * {@link StringAttributeRenderer#write(Object, Attribute, Request)}.
*
* @throws IOException If something goes wrong during rendition.
*/
@@ -65,9 +65,9 @@
public void testWrite() throws IOException {
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = createMock(TilesRequestContext.class);
+ Request requestContext = createMock(Request.class);
requestContext.dispatch("/myTemplate.jsp");
replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
@@ -78,7 +78,7 @@
/**
* Tests
- * {@link StringAttributeRenderer#isRenderable(Object, Attribute, TilesRequestContext)}.
+ * {@link StringAttributeRenderer#isRenderable(Object, Attribute, Request)}.
*
* @throws IOException If something goes wrong during rendition.
*/
@@ -86,9 +86,9 @@
public void testIsRenderable() throws IOException {
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
- TilesRequestContext requestContext = createMock(TilesRequestContext.class);
+ Request requestContext = createMock(Request.class);
replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
renderer.setRequestContextFactory(contextFactory);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java Sat Nov 7 19:17:09 2009
@@ -26,10 +26,10 @@
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import org.apache.tiles.request.ApplicationContext;
import org.junit.Before;
import org.junit.Test;
@@ -60,19 +60,19 @@
@Override
protected AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context) {
+ ApplicationContext context) {
return containerFactory;
}
};
}
/**
- * Test method for {@link AbstractTilesInitializer#initialize(TilesApplicationContext)}.
+ * Test method for {@link AbstractTilesInitializer#initialize(ApplicationContext)}.
*/
@SuppressWarnings("unchecked")
@Test
public void testInitialize() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> scope = createMock(Map.class);
@@ -88,33 +88,33 @@
}
/**
- * Test method for {@link AbstractTilesInitializer#createTilesApplicationContext(TilesApplicationContext)}.
+ * Test method for {@link AbstractTilesInitializer#createTilesApplicationContext(ApplicationContext)}.
*/
@Test
public void testCreateTilesApplicationContext() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
replay(containerFactory, context);
assertEquals(context, initializer.createTilesApplicationContext(context));
verify(containerFactory, context);
}
/**
- * Test method for {@link AbstractTilesInitializer#getContainerKey(TilesApplicationContext)}.
+ * Test method for {@link AbstractTilesInitializer#getContainerKey(ApplicationContext)}.
*/
@Test
public void testGetContainerKey() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
replay(containerFactory, context);
assertNull(initializer.getContainerKey(context));
verify(containerFactory, context);
}
/**
- * Test method for {@link AbstractTilesInitializer#createContainer(TilesApplicationContext)}.
+ * Test method for {@link AbstractTilesInitializer#createContainer(ApplicationContext)}.
*/
@Test
public void testCreateContainer() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
expect(containerFactory.createContainer(context)).andReturn(container);