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/07/30 16:53:28 UTC
svn commit: r799299 - in /tiles/framework/trunk/tiles-test: ./
src/main/java/org/apache/tiles/test/evaluator/
src/main/java/org/apache/tiles/test/factory/
Author: apetrelli
Date: Thu Jul 30 14:53:28 2009
New Revision: 799299
URL: http://svn.apache.org/viewvc?rev=799299&view=rev
Log:
TILES-443
Making tiles-test webapp use tiles-extras module.
Removed:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/evaluator/
Modified:
tiles/framework/trunk/tiles-test/pom.xml
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=799299&r1=799298&r2=799299&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Thu Jul 30 14:53:28 2009
@@ -39,22 +39,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tiles-jsp</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tiles-compat</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tiles-freemarker</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tiles-velocity</artifactId>
+ <artifactId>tiles-extras</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -83,11 +68,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.15</version>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
@@ -108,27 +88,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.5.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>2.0.10</version>
- </dependency>
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.7.3</version>
- </dependency>
</dependencies>
<build>
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java?rev=799299&r1=799298&r2=799299&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java Thu Jul 30 14:53:28 2009
@@ -31,11 +31,6 @@
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO;
import org.apache.tiles.definition.dao.CachingLocaleUrlDefinitionDAO;
-import org.apache.tiles.definition.pattern.DefinitionPatternMatcherFactory;
-import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
-import org.apache.tiles.definition.pattern.PrefixedPatternDefinitionResolver;
-import org.apache.tiles.definition.pattern.regexp.RegexpDefinitionPatternMatcherFactory;
-import org.apache.tiles.definition.pattern.wildcard.WildcardDefinitionPatternMatcherFactory;
import org.apache.tiles.locale.LocaleResolver;
/**
@@ -73,16 +68,4 @@
TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
return new CachingLocaleUrlDefinitionDAO();
}
-
- /** {@inheritDoc} */
- @Override
- protected <T> PatternDefinitionResolver<T> createPatternDefinitionResolver(
- Class<T> customizationKeyClass) {
- DefinitionPatternMatcherFactory wildcardFactory = new WildcardDefinitionPatternMatcherFactory();
- DefinitionPatternMatcherFactory regexpFactory = new RegexpDefinitionPatternMatcherFactory();
- PrefixedPatternDefinitionResolver<T> resolver = new PrefixedPatternDefinitionResolver<T>();
- resolver.registerDefinitionPatternMatcherFactory("WILDCARD", wildcardFactory);
- resolver.registerDefinitionPatternMatcherFactory("REGEXP", regexpFactory);
- return resolver;
- }
}
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=799299&r1=799298&r2=799299&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java Thu Jul 30 14:53:28 2009
@@ -23,61 +23,17 @@
import java.io.IOException;
import java.net.URL;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELResolver;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
-
-import ognl.OgnlException;
-import ognl.OgnlRuntime;
-import ognl.PropertyAccessor;
-
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
-import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.definition.DefinitionsFactoryException;
-import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
-import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
-import org.apache.tiles.evaluator.el.ELAttributeEvaluator;
-import org.apache.tiles.evaluator.el.TilesContextBeanELResolver;
-import org.apache.tiles.evaluator.el.TilesContextELResolver;
-import org.apache.tiles.evaluator.mvel.MVELAttributeEvaluator;
-import org.apache.tiles.evaluator.mvel.TilesContextBeanVariableResolverFactory;
-import org.apache.tiles.evaluator.mvel.TilesContextVariableResolverFactory;
-import org.apache.tiles.evaluator.ognl.ApplicationScopeNestedObjectExtractor;
-import org.apache.tiles.evaluator.ognl.DelegatePropertyAccessor;
-import org.apache.tiles.evaluator.ognl.NestedObjectDelegatePropertyAccessor;
-import org.apache.tiles.evaluator.ognl.OGNLAttributeEvaluator;
-import org.apache.tiles.evaluator.ognl.PropertyAccessorDelegateFactory;
-import org.apache.tiles.evaluator.ognl.RequestScopeNestedObjectExtractor;
-import org.apache.tiles.evaluator.ognl.SessionScopeNestedObjectExtractor;
-import org.apache.tiles.evaluator.ognl.TilesApplicationContextNestedObjectExtractor;
-import org.apache.tiles.evaluator.ognl.TilesContextPropertyAccessorDelegateFactory;
-import org.apache.tiles.factory.BasicTilesContainerFactory;
-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;
-import org.apache.tiles.jsp.evaluator.el.JspExpressionFactoryFactory;
-import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.extras.complete.CompleteAutoloadTilesContainerFactory;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
-import org.apache.tiles.test.exception.TilesTestRuntimeException;
import org.apache.tiles.test.renderer.ReverseStringAttributeRenderer;
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;
/**
@@ -85,28 +41,7 @@
*
* @version $Rev$ $Date$
*/
-public class TestTilesContainerFactory extends BasicTilesContainerFactory {
-
- /** {@inheritDoc} */
- @Override
- protected BasicTilesContainer instantiateContainer(
- TilesApplicationContext applicationContext) {
- return new CachingTilesContainer();
- }
-
- /** {@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;
- }
+public class TestTilesContainerFactory extends CompleteAutoloadTilesContainerFactory {
/** {@inheritDoc} */
@Override
@@ -123,123 +58,6 @@
renderer.setRequestContextFactory(contextFactory);
renderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
rendererFactory.registerRenderer("reversed", renderer);
-
- 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");
- freemarkerRenderer.setParameter("template_update_delay", "0");
- freemarkerRenderer.setParameter("default_encoding", "ISO-8859-1");
- freemarkerRenderer.setParameter("number_format", "0.##########");
- freemarkerRenderer.commit();
- rendererFactory.registerRenderer("freemarker", freemarkerRenderer);
-
- VelocityAttributeRenderer velocityRenderer = new VelocityAttributeRenderer();
- velocityRenderer.setApplicationContext(applicationContext);
- velocityRenderer.setAttributeEvaluatorFactory(attributeEvaluatorFactory);
- velocityRenderer.setRequestContextFactory(contextFactory);
- velocityRenderer.setParameter("org.apache.velocity.toolbox", "/WEB-INF/tools.xml");
- velocityRenderer.setParameter("org.apache.velocity.properties", "/WEB-INF/velocity.properties");
- velocityRenderer.commit();
- rendererFactory.registerRenderer("velocity", velocityRenderer);
- }
-
- /** {@inheritDoc} */
- @Override
- protected AttributeEvaluatorFactory createAttributeEvaluatorFactory(
- TilesApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
- BasicAttributeEvaluatorFactory attributeEvaluatorFactory = new BasicAttributeEvaluatorFactory(
- createELEvaluator(applicationContext));
- attributeEvaluatorFactory.registerAttributeEvaluator("MVEL",
- createMVELEvaluator());
- attributeEvaluatorFactory.registerAttributeEvaluator("OGNL",
- createOGNLEvaluator());
-
- return attributeEvaluatorFactory;
- }
-
- /**
- * Creates the EL evaluator.
- *
- * @param applicationContext The Tiles application context.
- * @return The EL evaluator.
- */
- private ELAttributeEvaluator createELEvaluator(
- TilesApplicationContext applicationContext) {
- ELAttributeEvaluator evaluator = new ELAttributeEvaluator();
- evaluator.setApplicationContext(applicationContext);
- JspExpressionFactoryFactory efFactory = new JspExpressionFactoryFactory();
- efFactory.setApplicationContext(applicationContext);
- evaluator.setExpressionFactory(efFactory.getExpressionFactory());
- ELResolver elResolver = new CompositeELResolver() {
- {
- add(new TilesContextELResolver());
- add(new TilesContextBeanELResolver());
- add(new ArrayELResolver(false));
- add(new ListELResolver(false));
- add(new MapELResolver(false));
- add(new ResourceBundleELResolver());
- add(new BeanELResolver(false));
- }
- };
- evaluator.setResolver(elResolver);
- return evaluator;
- }
-
- /**
- * Creates the MVEL evaluator.
- *
- * @return The MVEL evaluator.
- */
- private MVELAttributeEvaluator createMVELEvaluator() {
- TilesRequestContextHolder requestHolder = new TilesRequestContextHolder();
- VariableResolverFactory variableResolverFactory = new TilesContextVariableResolverFactory(
- requestHolder);
- variableResolverFactory
- .setNextFactory(new TilesContextBeanVariableResolverFactory(
- requestHolder));
- MVELAttributeEvaluator mvelEvaluator = new MVELAttributeEvaluator(requestHolder,
- variableResolverFactory);
- return mvelEvaluator;
- }
-
- /**
- * Creates the MVEL evaluator.
- *
- * @return The MVEL evaluator.
- */
- private OGNLAttributeEvaluator createOGNLEvaluator() {
- try {
- PropertyAccessor objectPropertyAccessor = OgnlRuntime.getPropertyAccessor(Object.class);
- PropertyAccessor mapPropertyAccessor = OgnlRuntime.getPropertyAccessor(Map.class);
- PropertyAccessor applicationContextPropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
- new TilesApplicationContextNestedObjectExtractor(),
- objectPropertyAccessor);
- PropertyAccessor requestScopePropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
- new RequestScopeNestedObjectExtractor(), mapPropertyAccessor);
- PropertyAccessor sessionScopePropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
- new SessionScopeNestedObjectExtractor(), mapPropertyAccessor);
- PropertyAccessor applicationScopePropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
- new ApplicationScopeNestedObjectExtractor(), mapPropertyAccessor);
- PropertyAccessorDelegateFactory<TilesRequestContext> factory =
- new TilesContextPropertyAccessorDelegateFactory(
- objectPropertyAccessor, applicationContextPropertyAccessor,
- requestScopePropertyAccessor, sessionScopePropertyAccessor,
- applicationScopePropertyAccessor);
- PropertyAccessor tilesRequestAccessor = new DelegatePropertyAccessor<TilesRequestContext>(factory);
- OgnlRuntime.setPropertyAccessor(TilesRequestContext.class, tilesRequestAccessor);
- return new OGNLAttributeEvaluator();
- } catch (OgnlException e) {
- throw new TilesTestRuntimeException("Cannot initialize OGNL evaluator", e);
- }
}
/** {@inheritDoc} */
@@ -263,11 +81,4 @@
"Cannot load definition URLs", e);
}
}
-
- /** {@inheritDoc} */
- @Override
- protected DefinitionsReader createDefinitionsReader(TilesApplicationContext applicationContext,
- TilesRequestContextFactory contextFactory) {
- return new CompatibilityDigesterDefinitionsReader();
- }
}