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:06:49 UTC
svn commit: r891411 [1/2] - in /tiles/sandbox/trunk/tiles3:
tiles-core/src/main/java/org/apache/tiles/factory/
tiles-core/src/main/java/org/apache/tiles/impl/
tiles-core/src/main/java/org/apache/tiles/renderer/impl/
tiles-core/src/test/java/org/apache/...
Author: apetrelli
Date: Wed Dec 16 20:06:48 2009
New Revision: 891411
URL: http://svn.apache.org/viewvc?rev=891411&view=rev
Log:
TILESSB-19
Inactivated TilesRequestContextFactory.
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/impl/BasicTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.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/impl/BasicTilesContainerTest.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/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-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.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-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -27,8 +27,6 @@
import java.util.Locale;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.Refreshable;
@@ -49,7 +47,6 @@
import org.apache.tiles.locale.impl.DefaultLocaleResolver;
import org.apache.tiles.preparer.BasicPreparerFactory;
import org.apache.tiles.preparer.PreparerFactory;
-import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
@@ -59,8 +56,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.NotAvailableFeatureException;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,21 +91,16 @@
@Override
public TilesContainer createContainer(ApplicationContext applicationContext) {
BasicTilesContainer container = instantiateContainer(applicationContext);
- TilesRequestContextFactory requestContextFactory =
- createRequestContextFactory(applicationContext);
- container.setRequestContextFactory(requestContextFactory);
container.setApplicationContext(applicationContext);
- LocaleResolver resolver = createLocaleResolver(applicationContext,
- requestContextFactory);
+ LocaleResolver resolver = createLocaleResolver(applicationContext);
container.setDefinitionsFactory(createDefinitionsFactory(applicationContext,
- requestContextFactory, resolver));
+ resolver));
AttributeEvaluatorFactory attributeEvaluatorFactory = createAttributeEvaluatorFactory(
- applicationContext, requestContextFactory, resolver);
+ applicationContext, resolver);
container.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
- container.setPreparerFactory(createPreparerFactory(applicationContext,
- requestContextFactory));
+ container.setPreparerFactory(createPreparerFactory(applicationContext));
container.setRendererFactory(createRendererFactory(applicationContext,
- requestContextFactory, container, attributeEvaluatorFactory));
+ container, attributeEvaluatorFactory));
return container;
}
@@ -127,121 +117,22 @@
}
/**
- * Create a Tiles request context factory. By default it creates a
- * {@link ChainedTilesRequestContextFactory}.
- *
- * @param context The Tiles application context.
- * @return The request context factory.
- * @since 2.1.1
- */
- protected TilesRequestContextFactory createRequestContextFactory(
- ApplicationContext context) {
- ChainedTilesRequestContextFactory contextFactory = new ChainedTilesRequestContextFactory();
- registerChainedRequestContextFactories(contextFactory);
-
- return contextFactory;
- }
-
- /**
- * Register elements of a chained request context factory.
- *
- * @param contextFactory The request context factory to use.
- * @since 2.1.1
- */
- protected void registerChainedRequestContextFactories(
- ChainedTilesRequestContextFactory contextFactory) {
- List<TilesRequestContextFactory> factories = getTilesRequestContextFactoriesToBeChained(contextFactory);
- contextFactory.setFactories(factories);
- }
-
- /**
- * Returns the list of {@link TilesRequestContextFactory} instances to be
- * chained together.
- *
- * @param parent The parent factory.
- * @return The list of factories.
- * @since 2.2.0
- */
- protected List<TilesRequestContextFactory> getTilesRequestContextFactoriesToBeChained(
- ChainedTilesRequestContextFactory parent) {
- List<TilesRequestContextFactory> factories = new ArrayList<TilesRequestContextFactory>();
- registerRequestContextFactory(
- "org.apache.tiles.request.servlet.ServletTilesRequestContextFactory",
- factories, parent);
- registerRequestContextFactory(
- "org.apache.tiles.portlet.context.PortletTilesRequestContextFactory",
- factories, parent);
- registerRequestContextFactory(
- "org.apache.tiles.jsp.context.JspTilesRequestContextFactory",
- factories, parent);
- return factories;
- }
-
- /**
- * Registers a {@link TilesRequestContextFactory} specifying its
- * classname.
- *
- * @param className The name of the class to instantiate.
- * @param factories The list of factories to add to.
- * @param parent The parent {@link TilesRequestContextFactory}. If null
- * it won't be considered.
- * @since 2.1.1
- */
- protected void registerRequestContextFactory(String className,
- List<TilesRequestContextFactory> factories,
- TilesRequestContextFactory parent) {
- TilesRequestContextFactory retValue = null;
- try {
- Class<? extends TilesRequestContextFactory> clazz = ClassUtil
- .getClass(className, TilesRequestContextFactory.class);
- retValue = clazz.newInstance();
- if (parent != null
- && retValue instanceof TilesRequestContextFactoryAware) {
- ((TilesRequestContextFactoryAware) retValue)
- .setRequestContextFactory(parent);
- }
- } catch (ClassNotFoundException e) {
- if (log.isDebugEnabled()) {
- log.debug("Cannot find class '" + className + "', ignoring problem", e);
- }
- } catch (NotAvailableFeatureException e) {
- if (log.isDebugEnabled()) {
- log.debug("Not available feature exception during instantiation of class '"
- + className + "', ignoring problem", e);
- }
- } catch (InstantiationException e) {
- throw new TilesContainerFactoryException(
- "Cannot instantiate '" + className + "'", e);
- } catch (IllegalAccessException e) {
- throw new TilesContainerFactoryException(
- "Cannot access default constructor '" + className + "'",
- e);
- }
- if (retValue != null) {
- factories.add(retValue);
- }
- }
-
- /**
* Creates the definitions factory. By default it creates a
* {@link UnresolvingLocaleDefinitionsFactory} with default dependencies.
*
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param resolver The locale resolver.
- *
* @return The definitions factory.
* @since 2.1.1
*/
protected DefinitionsFactory createDefinitionsFactory(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
UnresolvingLocaleDefinitionsFactory factory = instantiateDefinitionsFactory(
- applicationContext, contextFactory, resolver);
+ applicationContext, resolver);
factory.setApplicationContext(applicationContext);
factory.setLocaleResolver(resolver);
factory.setDefinitionDAO(createLocaleDefinitionDao(applicationContext,
- contextFactory, resolver));
+ resolver));
if (factory instanceof Refreshable) {
((Refreshable) factory).refresh();
}
@@ -251,15 +142,13 @@
/**
* Instantiate a new definitions factory based on Locale.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param resolver The locale resolver.
- *
* @return The definitions factory.
* @since 2.2.1
*/
protected UnresolvingLocaleDefinitionsFactory instantiateDefinitionsFactory(
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
+ LocaleResolver resolver) {
return new UnresolvingLocaleDefinitionsFactory();
}
@@ -267,14 +156,11 @@
/**
* Instantiate (and does not initialize) a Locale-based definition DAO.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param resolver The locale resolver.
- *
* @return The definition DAO.
* @since 2.1.1
*/
protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
ResolvingLocaleUrlDefinitionDAO dao = new ResolvingLocaleUrlDefinitionDAO();
return dao;
@@ -283,20 +169,17 @@
/**
* Creates a Locale-based definition DAO.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param resolver The locale resolver.
- *
* @return The definition DAO.
* @since 2.1.1
*/
@SuppressWarnings("unchecked")
protected DefinitionDAO<Locale> createLocaleDefinitionDao(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
BaseLocaleUrlDefinitionDAO definitionDao = instantiateLocaleDefinitionDao(
- applicationContext, contextFactory, resolver);
- definitionDao.setReader(createDefinitionsReader(applicationContext, contextFactory));
- definitionDao.setSourceURLs(getSourceURLs(applicationContext, contextFactory));
+ applicationContext, resolver);
+ definitionDao.setReader(createDefinitionsReader(applicationContext));
+ definitionDao.setSourceURLs(getSourceURLs(applicationContext));
definitionDao.setApplicationContext(applicationContext);
if (definitionDao instanceof PatternDefinitionResolverAware) {
((PatternDefinitionResolverAware<Locale>) definitionDao)
@@ -309,13 +192,10 @@
* Creates the locale resolver. By default it creates a
* {@link DefaultLocaleResolver}.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
- *
* @return The locale resolver.
* @since 2.1.1
*/
- protected LocaleResolver createLocaleResolver(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected LocaleResolver createLocaleResolver(ApplicationContext applicationContext) {
return new DefaultLocaleResolver();
}
@@ -323,14 +203,11 @@
* Creates the definitions reader. By default it creates a
* {@link DigesterDefinitionsReader}.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
- *
* @return The definitions reader.
* @since 2.1.1
*/
protected DefinitionsReader createDefinitionsReader(
- ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ ApplicationContext applicationContext) {
return new DigesterDefinitionsReader();
}
@@ -338,13 +215,10 @@
* Returns a list containing the URLs to be parsed. By default, it returns a
* list containing the URL point to "/WEB-INF/tiles.xml".
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
- *
* @return The source URLs.
* @since 2.1.1
*/
- protected List<URL> getSourceURLs(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected List<URL> getSourceURLs(ApplicationContext applicationContext) {
List<URL> retValue = new ArrayList<URL>(1);
try {
retValue.add(applicationContext.getResource("/WEB-INF/tiles.xml"));
@@ -361,15 +235,13 @@
* {@link DirectAttributeEvaluator} as the default evaluator.
*
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param resolver The locale resolver.
- *
* @return The evaluator factory.
* @since 2.2.0
*/
protected AttributeEvaluatorFactory createAttributeEvaluatorFactory(
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
+ LocaleResolver resolver) {
return new BasicAttributeEvaluatorFactory(new DirectAttributeEvaluator());
}
@@ -377,13 +249,10 @@
* Creates the preparer factory to use. By default it returns a
* {@link BasicPreparerFactory}.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
- *
* @return The preparer factory.
* @since 2.1.1
*/
- protected PreparerFactory createPreparerFactory(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected PreparerFactory createPreparerFactory(ApplicationContext applicationContext) {
return new BasicPreparerFactory();
}
@@ -394,26 +263,22 @@
* {@link StringAttributeRenderer}, {@link TemplateAttributeRenderer} and
* {@link DefinitionAttributeRenderer}.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param container The container.
* @param attributeEvaluatorFactory The attribute evaluator factory.
- *
* @return The renderer factory.
* @since 2.2.0
*/
protected RendererFactory createRendererFactory(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
- TilesContainer container, AttributeEvaluatorFactory attributeEvaluatorFactory) {
+ TilesContainer container,
+ AttributeEvaluatorFactory attributeEvaluatorFactory) {
BasicRendererFactory retValue = new BasicRendererFactory();
retValue.setApplicationContext(applicationContext);
- retValue.setRequestContextFactory(contextFactory);
retValue.setContainer(container);
retValue.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
- registerAttributeRenderers(retValue, applicationContext, contextFactory,
- container, attributeEvaluatorFactory);
+ registerAttributeRenderers(retValue, applicationContext, container,
+ attributeEvaluatorFactory);
retValue.setDefaultRenderer(createDefaultAttributeRenderer(retValue,
- applicationContext, contextFactory, container,
- attributeEvaluatorFactory));
+ applicationContext, container, attributeEvaluatorFactory));
return retValue;
}
@@ -423,7 +288,6 @@
*
* @param rendererFactory The renderer factory to configure.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param container The container.
* @param attributeEvaluatorFactory The attribute evaluator factory.
* @return The default attribute renderer.
@@ -432,7 +296,6 @@
protected AttributeRenderer createDefaultAttributeRenderer(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
ChainedDelegateAttributeRenderer retValue = new ChainedDelegateAttributeRenderer();
@@ -443,7 +306,6 @@
retValue.addAttributeRenderer((TypeDetectingAttributeRenderer) rendererFactory
.getRenderer(STRING_RENDERER_NAME));
retValue.setApplicationContext(applicationContext);
- retValue.setRequestContextFactory(contextFactory);
retValue.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return retValue;
}
@@ -476,7 +338,6 @@
*
* @param rendererFactory The renderer factory to configure.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param container The container.
* @param attributeEvaluatorFactory The attribute evaluator factory.
* @since 2.2.0
@@ -484,21 +345,17 @@
protected void registerAttributeRenderers(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
rendererFactory.registerRenderer(STRING_RENDERER_NAME,
createStringAttributeRenderer(rendererFactory,
- applicationContext, contextFactory, container,
- attributeEvaluatorFactory));
+ applicationContext, container, attributeEvaluatorFactory));
rendererFactory.registerRenderer(TEMPLATE_RENDERER_NAME,
createTemplateAttributeRenderer(rendererFactory,
- applicationContext, contextFactory, container,
- attributeEvaluatorFactory));
+ applicationContext, container, attributeEvaluatorFactory));
rendererFactory.registerRenderer(DEFINITION_RENDERER_NAME,
createDefinitionAttributeRenderer(rendererFactory,
- applicationContext, contextFactory, container,
- attributeEvaluatorFactory));
+ applicationContext, container, attributeEvaluatorFactory));
}
/**
@@ -506,7 +363,6 @@
*
* @param rendererFactory The renderer factory to configure.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param container The container.
* @param attributeEvaluatorFactory The attribute evaluator factory.
* @return The renderer.
@@ -515,12 +371,10 @@
protected AttributeRenderer createStringAttributeRenderer(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
StringAttributeRenderer stringRenderer = new StringAttributeRenderer();
stringRenderer.setApplicationContext(applicationContext);
- stringRenderer.setRequestContextFactory(contextFactory);
stringRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return stringRenderer;
}
@@ -530,7 +384,6 @@
*
* @param rendererFactory The renderer factory to configure.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param container The container.
* @param attributeEvaluatorFactory The attribute evaluator factory.
* @return The renderer.
@@ -539,12 +392,10 @@
protected AttributeRenderer createTemplateAttributeRenderer(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
TemplateAttributeRenderer templateRenderer = new TemplateAttributeRenderer();
templateRenderer.setApplicationContext(applicationContext);
- templateRenderer.setRequestContextFactory(contextFactory);
templateRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return templateRenderer;
}
@@ -554,7 +405,6 @@
*
* @param rendererFactory The renderer factory to configure.
* @param applicationContext The Tiles application context.
- * @param contextFactory The Tiles context factory.
* @param container The container.
* @param attributeEvaluatorFactory The attribute evaluator factory.
* @return The renderer.
@@ -563,13 +413,11 @@
protected AttributeRenderer createDefinitionAttributeRenderer(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
DefinitionAttributeRenderer definitionRenderer = new DefinitionAttributeRenderer();
definitionRenderer.setApplicationContext(applicationContext);
definitionRenderer.setContainer(container);
- definitionRenderer.setRequestContextFactory(contextFactory);
definitionRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return definitionRenderer;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=891411&r1=891410&r2=891411&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Wed Dec 16 20:06:48 2009
@@ -41,7 +41,6 @@
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,11 +95,6 @@
private AttributeEvaluatorFactory attributeEvaluatorFactory;
/**
- * The Tiles request context factory.
- */
- private TilesRequestContextFactory contextFactory;
-
- /**
* Initialization flag. If set, this container cannot be changed.
*/
private boolean initialized = false;
@@ -159,27 +153,6 @@
}
/**
- * Returns the request context factory.
- *
- * @return The request context factory.
- * @since 2.1.1
- */
- protected TilesRequestContextFactory getRequestContextFactory() {
- return contextFactory;
- }
-
- /**
- * Sets the request context factory.
- *
- * @param contextFactory The context factory.
- * @since 2.1.1
- */
- public void setRequestContextFactory(TilesRequestContextFactory contextFactory) {
- checkInit();
- this.contextFactory = contextFactory;
- }
-
- /**
* Returns the definitions factory.
*
* @return The definitions factory used by this container.
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -33,7 +33,6 @@
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,8 +43,8 @@
* @since 2.1.0
*/
public abstract class AbstractBaseAttributeRenderer implements
- AttributeRenderer, TilesRequestContextFactoryAware,
- TilesApplicationContextAware, AttributeEvaluatorFactoryAware {
+ AttributeRenderer, TilesApplicationContextAware,
+ AttributeEvaluatorFactoryAware {
/**
* The logging object.
@@ -54,13 +53,6 @@
.getLogger(AbstractBaseAttributeRenderer.class);
/**
- * The Tiles request context factory.
- *
- * @since 2.1.1
- */
- protected TilesRequestContextFactory contextFactory;
-
- /**
* The Tiles application context.
*
* @since 2.1.0
@@ -75,11 +67,6 @@
protected AttributeEvaluatorFactory attributeEvaluatorFactory;
/** {@inheritDoc} */
- public void setRequestContextFactory(TilesRequestContextFactory contextFactory) {
- this.contextFactory = contextFactory;
- }
-
- /** {@inheritDoc} */
public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
@@ -120,18 +107,6 @@
throws IOException;
/**
- * Creates a Tiles request context from request items.
- *
- * @param requestItems The request items.
- * @return The created Tiles request context.
- * @since 2.1.0
- */
- protected Request getRequestContext(Object... requestItems) {
- return contextFactory.createRequestContext(applicationContext,
- requestItems);
- }
-
- /**
* Checks if the current user is in one of the comma-separated roles
* specified in the <code>role</code> parameter.
*
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=891411&r1=891410&r2=891411&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 Wed Dec 16 20:06:48 2009
@@ -26,14 +26,12 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
-import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
/**
* Basic renderer factory implementation.
@@ -42,8 +40,8 @@
* @since 2.1.0
*/
public class BasicRendererFactory implements RendererFactory,
- TilesContainerAware, TilesRequestContextFactoryAware,
- TilesApplicationContextAware, AttributeEvaluatorFactoryAware {
+ TilesContainerAware, TilesApplicationContextAware,
+ AttributeEvaluatorFactoryAware {
/**
* The type renderers init parameter name.
@@ -69,13 +67,6 @@
protected static final Map<String, String> DEFAULT_TYPE_2_RENDERER;
/**
- * The Tiles context factory.
- *
- * @since 2.1.1
- */
- protected TilesRequestContextFactory contextFactory;
-
- /**
* The Tiles application context.
*
* @since 2.1.0
@@ -178,12 +169,6 @@
}
/** {@inheritDoc} */
- public void setRequestContextFactory(
- TilesRequestContextFactory contextFactory) {
- this.contextFactory = contextFactory;
- }
-
- /** {@inheritDoc} */
public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
@@ -195,10 +180,6 @@
* @since 2.1.0
*/
protected void initializeRenderer(AttributeRenderer renderer) {
- if (renderer instanceof TilesRequestContextFactoryAware) {
- ((TilesRequestContextFactoryAware) renderer)
- .setRequestContextFactory(contextFactory);
- }
if (renderer instanceof TilesApplicationContextAware) {
((TilesApplicationContextAware) renderer)
.setApplicationContext(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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -24,13 +24,11 @@
import static org.easymock.classextension.EasyMock.*;
import java.net.URL;
-import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory;
@@ -40,7 +38,6 @@
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.locale.impl.DefaultLocaleResolver;
-import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
import org.apache.tiles.preparer.BasicPreparerFactory;
import org.apache.tiles.preparer.PreparerFactory;
import org.apache.tiles.renderer.AttributeRenderer;
@@ -84,7 +81,7 @@
url = getClass().getResource("/org/apache/tiles/config/tiles-defs.xml");
EasyMock.expect(applicationContext.getResource("/WEB-INF/tiles.xml")).andReturn(url);
EasyMock.replay(applicationContext);
- factory = new CustomBasicTilesContainerFactory();
+ factory = new BasicTilesContainerFactory();
}
/**
@@ -97,64 +94,43 @@
}
/**
- * Tests {@link BasicTilesContainerFactory#createRequestContextFactory(ApplicationContext)}.
- */
- public void testCreateRequestContextFactory() {
- TilesRequestContextFactory contextFactory = factory
- .createRequestContextFactory(null);
- assertTrue("The class of the context factory is not correct",
- contextFactory instanceof ChainedTilesRequestContextFactory);
- }
-
- /**
* Tests {@link BasicTilesContainerFactory#createDefinitionsFactory(
- * ApplicationContext, TilesRequestContextFactory, LocaleResolver)}.
+ * ApplicationContext, LocaleResolver)}.
*/
public void testCreateDefinitionsFactory() {
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
- LocaleResolver resolver = factory.createLocaleResolver(applicationContext,
- requestContextFactory);
+ LocaleResolver resolver = factory.createLocaleResolver(applicationContext);
DefinitionsFactory defsFactory = factory.createDefinitionsFactory(
- applicationContext, requestContextFactory, resolver);
+ applicationContext, resolver);
assertTrue("The class of the definitions factory is not correct",
defsFactory instanceof UnresolvingLocaleDefinitionsFactory);
}
/**
* Tests {@link BasicTilesContainerFactory#createLocaleResolver(
- * ApplicationContext, TilesRequestContextFactory)}.
+ * ApplicationContext)}.
*/
public void testCreateLocaleResolver() {
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
- LocaleResolver localeResolver = factory.createLocaleResolver(applicationContext,
- requestContextFactory);
+ LocaleResolver localeResolver = factory.createLocaleResolver(applicationContext);
assertTrue("The class of the locale resolver is not correct",
localeResolver instanceof DefaultLocaleResolver);
}
/**
* Tests {@link BasicTilesContainerFactory#createDefinitionsReader(
- * ApplicationContext, TilesRequestContextFactory)}.
+ * ApplicationContext)}.
*/
public void testCreateDefinitionsReader() {
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
- DefinitionsReader reader = factory.createDefinitionsReader(applicationContext,
- requestContextFactory);
+ DefinitionsReader reader = factory.createDefinitionsReader(applicationContext);
assertTrue("The class of the reader is not correct",
reader instanceof DigesterDefinitionsReader);
}
/**
* Tests
- * {@link BasicTilesContainerFactory#getSourceURLs(ApplicationContext, TilesRequestContextFactory)}.
+ * {@link BasicTilesContainerFactory#getSourceURLs(ApplicationContext)}.
*/
public void testGetSourceURLs() {
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
- List<URL> urls = factory.getSourceURLs(applicationContext, requestContextFactory);
+ List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals("The urls list is not one-sized", 1, urls.size());
assertEquals("The URL is not correct", url, urls.get(0));
}
@@ -162,16 +138,13 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createAttributeEvaluatorFactory(
- * ApplicationContext, TilesRequestContextFactory, LocaleResolver)}.
+ * ApplicationContext, LocaleResolver)}.
*/
public void testCreateAttributeEvaluatorFactory() {
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
- LocaleResolver resolver = factory.createLocaleResolver(applicationContext,
- requestContextFactory);
+ LocaleResolver resolver = factory.createLocaleResolver(applicationContext);
AttributeEvaluatorFactory attributeEvaluatorFactory = factory
.createAttributeEvaluatorFactory(applicationContext,
- requestContextFactory, resolver);
+ resolver);
assertTrue(
"The class of the evaluator is not correct",
attributeEvaluatorFactory.getAttributeEvaluator((String) null) instanceof DirectAttributeEvaluator);
@@ -179,33 +152,27 @@
/**
* Tests
- * {@link BasicTilesContainerFactory#createPreparerFactory(ApplicationContext, TilesRequestContextFactory)}.
+ * {@link BasicTilesContainerFactory#createPreparerFactory(ApplicationContext)}.
*/
public void testCreatePreparerFactory() {
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
PreparerFactory preparerFactory = factory.createPreparerFactory(
- applicationContext, requestContextFactory);
+ applicationContext);
assertTrue("The class of the preparer factory is not correct",
preparerFactory instanceof BasicPreparerFactory);
}
/**
* Tests {@link BasicTilesContainerFactory#createRendererFactory(
- * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateRendererFactory() {
TilesContainer container = factory.createContainer(applicationContext);
- TilesRequestContextFactory requestContextFactory = factory
- .createRequestContextFactory(applicationContext);
- LocaleResolver resolver = factory.createLocaleResolver(applicationContext,
- requestContextFactory);
+ LocaleResolver resolver = factory.createLocaleResolver(applicationContext);
AttributeEvaluatorFactory attributeEvaluatorFactory = factory
.createAttributeEvaluatorFactory(applicationContext,
- requestContextFactory, resolver);
+ resolver);
RendererFactory rendererFactory = factory.createRendererFactory(
- applicationContext, requestContextFactory, container,
- attributeEvaluatorFactory);
+ applicationContext, container, attributeEvaluatorFactory);
assertTrue("The class of the renderer factory is not correct",
rendererFactory instanceof BasicRendererFactory);
AttributeRenderer renderer = rendererFactory.getRenderer("string");
@@ -225,7 +192,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createDefaultAttributeRenderer(BasicRendererFactory,
- * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateDefaultAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -243,8 +210,8 @@
replay(container, requestContextFactory, attributeEvaluatorFactory,
rendererFactory);
AttributeRenderer renderer = factory.createDefaultAttributeRenderer(
- rendererFactory, applicationContext, requestContextFactory,
- container, attributeEvaluatorFactory);
+ rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
assertTrue("The default renderer class is not correct",
renderer instanceof ChainedDelegateAttributeRenderer);
verify(container, requestContextFactory, attributeEvaluatorFactory,
@@ -254,7 +221,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createStringAttributeRenderer(BasicRendererFactory,
- * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateStringAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -265,8 +232,8 @@
replay(container, requestContextFactory, attributeEvaluatorFactory,
rendererFactory);
AttributeRenderer renderer = factory.createStringAttributeRenderer(
- rendererFactory, applicationContext, requestContextFactory,
- container, attributeEvaluatorFactory);
+ rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
assertTrue("The renderer class is not correct",
renderer instanceof StringAttributeRenderer);
verify(container, requestContextFactory, attributeEvaluatorFactory,
@@ -276,7 +243,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createTemplateAttributeRenderer(BasicRendererFactory,
- * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateTemplateAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -287,8 +254,8 @@
replay(container, requestContextFactory, attributeEvaluatorFactory,
rendererFactory);
AttributeRenderer renderer = factory.createTemplateAttributeRenderer(
- rendererFactory, applicationContext, requestContextFactory,
- container, attributeEvaluatorFactory);
+ rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
assertTrue("The renderer class is not correct",
renderer instanceof TemplateAttributeRenderer);
verify(container, requestContextFactory, attributeEvaluatorFactory,
@@ -298,7 +265,7 @@
/**
* Tests
* {@link BasicTilesContainerFactory#createDefinitionAttributeRenderer(BasicRendererFactory,
- * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesContainer, AttributeEvaluatorFactory)}.
*/
public void testCreateDefinitionAttributeRenderer() {
TilesContainer container = createMock(TilesContainer.class);
@@ -309,29 +276,11 @@
replay(container, requestContextFactory, attributeEvaluatorFactory,
rendererFactory);
AttributeRenderer renderer = factory.createDefinitionAttributeRenderer(
- rendererFactory, applicationContext, requestContextFactory,
- container, attributeEvaluatorFactory);
+ rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
assertTrue("The renderer class is not correct",
renderer instanceof DefinitionAttributeRenderer);
verify(container, requestContextFactory, attributeEvaluatorFactory,
rendererFactory);
}
-
- /**
- * A test Tiles container factory.
- */
- public static class CustomBasicTilesContainerFactory extends BasicTilesContainerFactory {
-
- /** {@inheritDoc} */
- @Override
- protected void registerChainedRequestContextFactories(
- ChainedTilesRequestContextFactory contextFactory) {
- List<TilesRequestContextFactory> factories =
- new ArrayList<TilesRequestContextFactory>(1);
- RepeaterTilesRequestContextFactory factory = new RepeaterTilesRequestContextFactory();
- factory.setRequestContextFactory(contextFactory);
- factories.add(factory);
- contextFactory.setFactories(factories);
- }
- }
}
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=891411&r1=891410&r2=891411&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 Wed Dec 16 20:06:48 2009
@@ -23,20 +23,15 @@
import java.io.IOException;
import java.io.StringWriter;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.TestCase;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesException;
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
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.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,7 +73,7 @@
e);
}
EasyMock.replay(context);
- AbstractTilesContainerFactory factory = new CustomTilesContainerFactory();
+ AbstractTilesContainerFactory factory = new BasicTilesContainerFactory();
container = (BasicTilesContainer) factory.createContainer(context);
}
@@ -87,7 +82,6 @@
*/
public void testInitialization() {
assertNotNull(container);
- assertNotNull(container.getRequestContextFactory());
assertNotNull(container.getPreparerFactory());
assertNotNull(container.getDefinitionsFactory());
}
@@ -127,7 +121,7 @@
StringWriter writer = new StringWriter();
EasyMock.expect(request.getWriter()).andReturn(writer);
EasyMock.replay(request);
- Attribute attribute = new Attribute((Object) "This is the value", "myrole");
+ Attribute attribute = new Attribute("This is the value", "myrole");
attribute.setRenderer("string");
container.render(attribute, request);
writer.close();
@@ -150,29 +144,9 @@
public void testEvaluate() {
Request request = EasyMock.createMock(Request.class);
EasyMock.replay(request);
- Attribute attribute = new Attribute((Object) "This is the value");
+ Attribute attribute = new Attribute("This is the value");
Object value = container.evaluate(attribute, request);
assertEquals("The attribute has not been evaluated correctly",
"This is the value", value);
}
-
- /**
- * A BasicTilesContainerFactory with overridden createRequestContextFactory
- * method.
- *
- * @version $Rev$ $Date$
- */
- private static class CustomTilesContainerFactory extends BasicTilesContainerFactory {
-
- /** {@inheritDoc} */
- @Override
- protected void registerChainedRequestContextFactories(
- ChainedTilesRequestContextFactory contextFactory) {
- List<TilesRequestContextFactory> factories = new ArrayList<TilesRequestContextFactory>(
- 1);
- factories.add(new RepeaterTilesRequestContextFactory());
-
- contextFactory.setFactories(factories);
- }
- }
}
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -32,7 +32,6 @@
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
/**
@@ -49,7 +48,7 @@
/** {@inheritDoc} */
@Override
- protected void setUp() throws Exception {
+ protected void setUp() {
renderer = new MockAttributeRenderer();
renderer.setAttributeEvaluatorFactory(new BasicAttributeEvaluatorFactory(
new DirectAttributeEvaluator()));
@@ -57,18 +56,6 @@
/**
* Tests
- * {@link AbstractBaseAttributeRenderer#setRequestContextFactory(TilesRequestContextFactory)}.
- */
- public void testSetContextFactory() {
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
- EasyMock.replay(contextFactory);
- renderer.setRequestContextFactory(contextFactory);
- assertNotNull("The context factory is null", renderer.contextFactory);
- }
-
- /**
- * Tests
* {@link AbstractBaseAttributeRenderer#setApplicationContext(ApplicationContext)}.
*/
public void testSetApplicationContext() {
@@ -90,60 +77,31 @@
StringWriter writer = new StringWriter();
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
Request requestContext = EasyMock
.createMock(Request.class);
- EasyMock.expect(contextFactory.createRequestContext(applicationContext))
- .andReturn(requestContext);
EasyMock.expect(requestContext.getWriter()).andReturn(writer);
- EasyMock.replay(applicationContext, contextFactory, requestContext);
+ EasyMock.replay(applicationContext, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, requestContext);
writer.close();
assertEquals("Wrongly written", "wrote", writer.toString());
}
/**
- * Tests {@link AbstractBaseAttributeRenderer#getRequestContext(Object...)}.
- */
- public void testGetRequestContext() {
- ApplicationContext applicationContext = EasyMock
- .createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
- Request requestContext = EasyMock
- .createMock(Request.class);
- EasyMock.expect(contextFactory.createRequestContext(applicationContext))
- .andReturn(requestContext);
- EasyMock.replay(applicationContext, contextFactory, requestContext);
- renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
- assertTrue("This is not the expected request",
- requestContext == renderer.getRequestContext());
- }
-
- /**
* Tests
* {@link AbstractBaseAttributeRenderer#isPermitted(Request, Set)}.
*/
public void testIsPermitted() {
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
Request requestContext = EasyMock
.createMock(Request.class);
- EasyMock.expect(contextFactory.createRequestContext(applicationContext))
- .andReturn(requestContext);
EasyMock.expect(requestContext.isUserInRole("first")).andReturn(
Boolean.TRUE).anyTimes();
EasyMock.expect(requestContext.isUserInRole("second")).andReturn(
Boolean.FALSE).anyTimes();
- EasyMock.replay(applicationContext, contextFactory, requestContext);
+ EasyMock.replay(applicationContext, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -23,14 +23,13 @@
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.tiles.TilesContainer;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
-import junit.framework.TestCase;
-
/**
* Basic renderer factory implementation.
*
@@ -46,17 +45,14 @@
/** {@inheritDoc} */
@Override
- public void setUp() throws Exception {
+ public void setUp() {
rendererFactory = new BasicRendererFactory();
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
TilesContainer container = EasyMock.createMock(TilesContainer.class);
rendererFactory.setApplicationContext(applicationContext);
- rendererFactory.setRequestContextFactory(contextFactory);
rendererFactory.setContainer(container);
- EasyMock.replay(applicationContext, contextFactory, container);
+ EasyMock.replay(applicationContext, container);
}
/**
@@ -94,14 +90,6 @@
}
/**
- * Tests {@link BasicRendererFactory#setRequestContextFactory(TilesRequestContextFactory)}.
- */
- public void testSetContextFactory() {
- assertNotNull("The context factory is null",
- rendererFactory.contextFactory);
- }
-
- /**
* Tests
* {@link BasicRendererFactory#setApplicationContext(ApplicationContext)}.
*/
@@ -117,7 +105,6 @@
DefinitionAttributeRenderer renderer = new DefinitionAttributeRenderer();
rendererFactory.initializeRenderer(renderer);
assertNotNull("The container is null", renderer.container);
- assertNotNull("The context factory is null", renderer.contextFactory);
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -32,7 +32,6 @@
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -94,8 +93,6 @@
null, "definition");
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
Request requestContext = EasyMock
.createMock(Request.class);
@@ -104,14 +101,13 @@
requestContext)).andReturn(Boolean.TRUE);
definitionRenderer.render(attribute, requestContext);
- replay(applicationContext, contextFactory, requestContext,
- stringRenderer, templateRenderer, definitionRenderer);
+ replay(applicationContext, requestContext, stringRenderer,
+ templateRenderer, definitionRenderer);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, requestContext);
writer.close();
- verify(applicationContext, contextFactory, requestContext,
- stringRenderer, templateRenderer, definitionRenderer);
+ verify(applicationContext, requestContext, stringRenderer,
+ templateRenderer, definitionRenderer);
}
/**
@@ -127,8 +123,6 @@
"string");
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
Request requestContext = EasyMock
.createMock(Request.class);
expect(
@@ -142,13 +136,12 @@
requestContext)).andReturn(Boolean.TRUE);
stringRenderer.render(attribute, requestContext);
- replay(applicationContext, contextFactory, requestContext,
- stringRenderer, templateRenderer, definitionRenderer);
+ replay(applicationContext, requestContext, stringRenderer,
+ templateRenderer, definitionRenderer);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, requestContext);
- verify(applicationContext, contextFactory, requestContext,
- stringRenderer, templateRenderer, definitionRenderer);
+ verify(applicationContext, requestContext, stringRenderer,
+ templateRenderer, definitionRenderer);
}
/**
@@ -165,8 +158,6 @@
(Expression) null, null, "template");
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = EasyMock
- .createMock(TilesRequestContextFactory.class);
Request requestContext = EasyMock
.createMock(Request.class);
templateRenderer.render(attribute, requestContext);
@@ -177,13 +168,12 @@
templateRenderer.isRenderable("/myTemplate.jsp", attribute,
requestContext)).andReturn(Boolean.TRUE);
- replay(applicationContext, contextFactory, requestContext,
- stringRenderer, templateRenderer, definitionRenderer);
+ replay(applicationContext, requestContext, stringRenderer,
+ templateRenderer, definitionRenderer);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, requestContext);
writer.close();
- verify(applicationContext, contextFactory, requestContext,
- stringRenderer, templateRenderer, definitionRenderer);
+ verify(applicationContext, requestContext, stringRenderer,
+ templateRenderer, definitionRenderer);
}
}
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -32,7 +32,6 @@
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +49,7 @@
/** {@inheritDoc} */
@Before
- public void setUp() throws Exception {
+ public void setUp() {
renderer = new StringAttributeRenderer();
renderer.setAttributeEvaluatorFactory(new BasicAttributeEvaluatorFactory(
new DirectAttributeEvaluator()));
@@ -68,16 +67,14 @@
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
Request requestContext = createMock(Request.class);
expect(requestContext.getWriter()).andReturn(writer);
- replay(applicationContext, contextFactory, requestContext);
+ replay(applicationContext, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, requestContext);
writer.close();
assertEquals("Not written 'Result'", "Result", writer.toString());
- verify(applicationContext, contextFactory, requestContext);
+ verify(applicationContext, requestContext);
}
/**
@@ -87,16 +84,14 @@
* @throws IOException If something goes wrong.
*/
@Test
- public void testIsRenderable() throws IOException {
+ public void testIsRenderable() {
Attribute attribute = new Attribute("Result", (Expression) null, null,
"string");
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
Request requestContext = createMock(Request.class);
- replay(applicationContext, contextFactory, requestContext);
+ replay(applicationContext, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
assertTrue(renderer.isRenderable("Result", attribute, requestContext));
- verify(applicationContext, contextFactory, requestContext);
+ verify(applicationContext, 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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -31,7 +31,6 @@
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +48,7 @@
/** {@inheritDoc} */
@Before
- public void setUp() throws Exception {
+ public void setUp() {
renderer = new TemplateAttributeRenderer();
renderer.setAttributeEvaluatorFactory(new BasicAttributeEvaluatorFactory(
new DirectAttributeEvaluator()));
@@ -66,14 +65,12 @@
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
Request requestContext = createMock(Request.class);
requestContext.dispatch("/myTemplate.jsp");
- replay(applicationContext, contextFactory, requestContext);
+ replay(applicationContext, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, requestContext);
- verify(applicationContext, contextFactory, requestContext);
+ verify(applicationContext, requestContext);
}
/**
@@ -83,17 +80,15 @@
* @throws IOException If something goes wrong during rendition.
*/
@Test
- public void testIsRenderable() throws IOException {
+ public void testIsRenderable() {
Attribute attribute = new Attribute("/myTemplate.jsp",
(Expression) null, null, "template");
ApplicationContext applicationContext = createMock(ApplicationContext.class);
- TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
Request requestContext = createMock(Request.class);
- replay(applicationContext, contextFactory, requestContext);
+ replay(applicationContext, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
assertTrue(renderer.isRenderable("/myTemplate.jsp", attribute,
requestContext));
- verify(applicationContext, contextFactory, requestContext);
+ verify(applicationContext, 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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -41,7 +41,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
@@ -59,7 +58,6 @@
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
import org.apache.tiles.factory.BasicTilesContainerFactory;
import org.apache.tiles.factory.TilesContainerFactoryException;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
import org.apache.tiles.freemarker.renderer.FreeMarkerAttributeRenderer;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.impl.mgmt.CachingTilesContainer;
@@ -82,9 +80,7 @@
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.util.URLUtil;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.mvel2.integration.VariableResolverFactory;
@@ -125,33 +121,17 @@
/** {@inheritDoc} */
@Override
- protected List<TilesRequestContextFactory> getTilesRequestContextFactoriesToBeChained(
- ChainedTilesRequestContextFactory parent) {
- List<TilesRequestContextFactory> factories = super.getTilesRequestContextFactoriesToBeChained(parent);
- registerRequestContextFactory(
- FreeMarkerTilesRequestContextFactory.class.getName(),
- factories, parent);
- registerRequestContextFactory(
- VelocityTilesRequestContextFactory.class.getName(),
- factories, parent);
- return factories;
- }
-
- /** {@inheritDoc} */
- @Override
protected void registerAttributeRenderers(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
- super.registerAttributeRenderers(rendererFactory, applicationContext, contextFactory,
- container, attributeEvaluatorFactory);
+ super.registerAttributeRenderers(rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
FreeMarkerAttributeRenderer freemarkerRenderer = new FreeMarkerAttributeRenderer();
freemarkerRenderer.setApplicationContext(applicationContext);
freemarkerRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
- freemarkerRenderer.setRequestContextFactory(contextFactory);
freemarkerRenderer.setParameter("TemplatePath", "/");
freemarkerRenderer.setParameter("NoCache", "true");
freemarkerRenderer.setParameter("ContentType", "text/html");
@@ -164,7 +144,6 @@
VelocityAttributeRenderer velocityRenderer = new VelocityAttributeRenderer();
velocityRenderer.setApplicationContext(applicationContext);
velocityRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
- velocityRenderer.setRequestContextFactory(contextFactory);
velocityRenderer.commit();
rendererFactory.registerRenderer(VELOCITY_RENDERER_NAME, velocityRenderer);
}
@@ -176,7 +155,6 @@
protected AttributeRenderer createDefaultAttributeRenderer(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
ChainedDelegateAttributeRenderer retValue = new ChainedDelegateAttributeRenderer();
@@ -191,7 +169,6 @@
retValue.addAttributeRenderer((TypeDetectingAttributeRenderer) rendererFactory
.getRenderer(STRING_RENDERER_NAME));
retValue.setApplicationContext(applicationContext);
- retValue.setRequestContextFactory(contextFactory);
retValue.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
return retValue;
}
@@ -200,7 +177,7 @@
@Override
protected AttributeEvaluatorFactory createAttributeEvaluatorFactory(
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
+ LocaleResolver resolver) {
BasicAttributeEvaluatorFactory attributeEvaluatorFactory = new BasicAttributeEvaluatorFactory(
createELEvaluator(applicationContext));
attributeEvaluatorFactory.registerAttributeEvaluator("MVEL",
@@ -225,8 +202,7 @@
/** {@inheritDoc} */
@Override
- protected List<URL> getSourceURLs(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected List<URL> getSourceURLs(ApplicationContext applicationContext) {
try {
Set<URL> finalSet = new HashSet<URL>();
Set<URL> webINFSet = applicationContext.getResources("/WEB-INF/**/tiles*.xml");
@@ -248,8 +224,7 @@
/** {@inheritDoc} */
@Override
- protected DefinitionsReader createDefinitionsReader(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected DefinitionsReader createDefinitionsReader(ApplicationContext applicationContext) {
return new CompatibilityDigesterDefinitionsReader();
}
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -42,15 +42,12 @@
import org.apache.tiles.Definition;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
import org.apache.tiles.definition.pattern.PrefixedPatternDefinitionResolver;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
-import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
import org.apache.tiles.freemarker.renderer.FreeMarkerAttributeRenderer;
import org.apache.tiles.impl.mgmt.CachingTilesContainer;
-import org.apache.tiles.jsp.context.JspTilesRequestContextFactory;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
@@ -62,8 +59,6 @@
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.request.servlet.ServletTilesApplicationContext;
-import org.apache.tiles.request.servlet.ServletTilesRequestContextFactory;
-import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.apache.velocity.tools.view.VelocityView;
import org.junit.Before;
@@ -77,16 +72,6 @@
public class CompleteAutoloadTilesContainerFactoryTest {
/**
- * The position of the velocity factory.
- */
- private static final int VELOCITY_FACTORY_POSITION = 3;
-
- /**
- * The number of factories.
- */
- private static final int FACTORIES_SIZE = 4;
-
- /**
* The object to test.
*/
private CompleteAutoloadTilesContainerFactory factory;
@@ -112,29 +97,8 @@
/**
* Test method for
* {@link CompleteAutoloadTilesContainerFactory
- * #getTilesRequestContextFactoriesToBeChained(ChainedTilesRequestContextFactory)}
- * .
- */
- @Test
- public void testGetTilesRequestContextFactoriesToBeChainedChainedTilesRequestContextFactory() {
- ChainedTilesRequestContextFactory parent = createMock(ChainedTilesRequestContextFactory.class);
-
- replay(parent);
- List<TilesRequestContextFactory> factories = factory
- .getTilesRequestContextFactoriesToBeChained(parent);
- assertEquals(FACTORIES_SIZE, factories.size());
- assertTrue(factories.get(0) instanceof ServletTilesRequestContextFactory);
- assertTrue(factories.get(1) instanceof JspTilesRequestContextFactory);
- assertTrue(factories.get(2) instanceof FreeMarkerTilesRequestContextFactory);
- assertTrue(factories.get(VELOCITY_FACTORY_POSITION) instanceof VelocityTilesRequestContextFactory);
- verify(parent);
- }
-
- /**
- * Test method for
- * {@link CompleteAutoloadTilesContainerFactory
* #registerAttributeRenderers(BasicRendererFactory, ApplicationContext,
- * TilesRequestContextFactory, TilesContainer, evaluator.AttributeEvaluatorFactory)}
+ * TilesContainer, evaluator.AttributeEvaluatorFactory)}
* .
*/
@SuppressWarnings("deprecation")
@@ -189,7 +153,7 @@
replay(rendererFactory, applicationContext, contextFactory, container,
attributeEvaluatorFactory, servletContext);
factory.registerAttributeRenderers(rendererFactory, applicationContext,
- contextFactory, container, attributeEvaluatorFactory);
+ container, attributeEvaluatorFactory);
verify(rendererFactory, applicationContext, contextFactory, container,
attributeEvaluatorFactory, servletContext);
}
@@ -197,7 +161,7 @@
/**
* Tests
* {@link CompleteAutoloadTilesContainerFactory#createDefaultAttributeRenderer(BasicRendererFactory,
- * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesContainer, AttributeEvaluatorFactory)}.
*/
@Test
public void testCreateDefaultAttributeRenderer() {
@@ -221,8 +185,8 @@
replay(container, requestContextFactory, attributeEvaluatorFactory,
rendererFactory, applicationContext);
AttributeRenderer renderer = factory.createDefaultAttributeRenderer(
- rendererFactory, applicationContext, requestContextFactory,
- container, attributeEvaluatorFactory);
+ rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
assertTrue("The default renderer class is not correct",
renderer instanceof ChainedDelegateAttributeRenderer);
verify(container, requestContextFactory, attributeEvaluatorFactory,
@@ -232,7 +196,7 @@
/**
* Test method for
* {@link CompleteAutoloadTilesContainerFactory
- * #createAttributeEvaluatorFactory(ApplicationContext, TilesRequestContextFactory, locale.LocaleResolver)}
+ * #createAttributeEvaluatorFactory(ApplicationContext, locale.LocaleResolver)}
* .
*/
@Test
@@ -254,7 +218,7 @@
JspFactory.setDefaultFactory(jspFactory);
AttributeEvaluatorFactory attributeEvaluatorFactory = factory
.createAttributeEvaluatorFactory(applicationContext,
- contextFactory, resolver);
+ resolver);
assertTrue(attributeEvaluatorFactory instanceof BasicAttributeEvaluatorFactory);
assertNotNull(attributeEvaluatorFactory.getAttributeEvaluator("EL"));
assertNotNull(attributeEvaluatorFactory.getAttributeEvaluator("MVEL"));
@@ -288,7 +252,7 @@
/**
* Test method for
- * {@link CompleteAutoloadTilesContainerFactory#getSourceURLs(ApplicationContext, TilesRequestContextFactory)}
+ * {@link CompleteAutoloadTilesContainerFactory#getSourceURLs(ApplicationContext)}
* .
* @throws IOException If something goes wrong.
*/
@@ -312,7 +276,7 @@
expect(applicationContext.getResources("classpath*:META-INF/**/tiles*.xml")).andReturn(urls2);
replay(applicationContext, contextFactory);
- List<URL> urls = factory.getSourceURLs(applicationContext, contextFactory);
+ List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals(2, urls.size());
assertTrue(urls.contains(url1));
assertTrue(urls.contains(url3));
@@ -338,7 +302,7 @@
expect(applicationContext.getResources("classpath*:META-INF/**/tiles*.xml")).andReturn(urls2);
replay(applicationContext, contextFactory);
- List<URL> urls = factory.getSourceURLs(applicationContext, contextFactory);
+ List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals(1, urls.size());
assertTrue(urls.contains(url3));
verify(applicationContext, contextFactory);
@@ -365,7 +329,7 @@
expect(applicationContext.getResources("classpath*:META-INF/**/tiles*.xml")).andReturn(null);
replay(applicationContext, contextFactory);
- List<URL> urls = factory.getSourceURLs(applicationContext, contextFactory);
+ List<URL> urls = factory.getSourceURLs(applicationContext);
assertEquals(1, urls.size());
assertTrue(urls.contains(url1));
verify(applicationContext, contextFactory);
@@ -374,7 +338,7 @@
/**
* Test method for
* {@link CompleteAutoloadTilesContainerFactory
- * #createDefinitionsReader(ApplicationContext, TilesRequestContextFactory)}
+ * #createDefinitionsReader(ApplicationContext)}
* .
*/
@Test
@@ -383,8 +347,7 @@
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
replay(applicationContext, contextFactory);
- assertTrue(factory.createDefinitionsReader(applicationContext,
- contextFactory) instanceof CompatibilityDigesterDefinitionsReader);
+ assertTrue(factory.createDefinitionsReader(applicationContext) instanceof CompatibilityDigesterDefinitionsReader);
verify(applicationContext, contextFactory);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java?rev=891411&r1=891410&r2=891411&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java Wed Dec 16 20:06:48 2009
@@ -31,7 +31,6 @@
import org.apache.tiles.definition.dao.CachingLocaleUrlDefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.test.factory.TestTilesContainerFactory;
/**
@@ -48,8 +47,7 @@
/** {@inheritDoc} */
@Override
- protected List<URL> getSourceURLs(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected List<URL> getSourceURLs(ApplicationContext applicationContext) {
List<URL> urls = new ArrayList<URL>(URL_COUNT);
try {
urls.add(applicationContext.getResource("classpath:/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml"));
@@ -66,7 +64,7 @@
@Override
protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
+ LocaleResolver resolver) {
return new CachingLocaleUrlDefinitionDAO();
}
}
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=891411&r1=891410&r2=891411&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:06:48 2009
@@ -31,7 +31,6 @@
import org.apache.tiles.extras.complete.CompleteAutoloadTilesContainerFactory;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.TilesRequestContextFactory;
import org.apache.tiles.test.renderer.ReverseStringAttributeRenderer;
import org.apache.tiles.util.URLUtil;
@@ -48,22 +47,19 @@
protected void registerAttributeRenderers(
BasicRendererFactory rendererFactory,
ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
- super.registerAttributeRenderers(rendererFactory, applicationContext, contextFactory,
- container, attributeEvaluatorFactory);
+ super.registerAttributeRenderers(rendererFactory, applicationContext, container,
+ attributeEvaluatorFactory);
ReverseStringAttributeRenderer renderer = new ReverseStringAttributeRenderer();
renderer.setApplicationContext(applicationContext);
- renderer.setRequestContextFactory(contextFactory);
renderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
rendererFactory.registerRenderer("reversed", renderer);
}
/** {@inheritDoc} */
@Override
- protected List<URL> getSourceURLs(ApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
+ protected List<URL> getSourceURLs(ApplicationContext applicationContext) {
try {
List<URL> urls;
Set<URL> urlSet = applicationContext