Author: apetrelli
Date: Sun Jul 13 08:40:30 2008
New Revision: 676346
URL: http://svn.apache.org/viewvc?rev=676346&view=rev
Log:
TILES-84
Added wildcard loading in test webapp.
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
(props changed)
- copied unchanged from r671976,
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs-alt.xml
Removed:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs-alt.xml
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=676346&r1=676345&r2=676346&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Sun Jul 13 08:40:30 2008
@@ -97,6 +97,11 @@
<artifactId>spring-jdbc</artifactId>
<version>2.5.5</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.5.5</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=676346&r1=676345&r2=676346&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
Sun Jul 13 08:40:30 2008
@@ -53,7 +53,7 @@
TilesContextFactory contextFactory) {
List<URL> urls = new ArrayList<URL>(URL_COUNT);
try {
-
urls.add(applicationContext.getResource("/WEB-INF/tiles-defs-alt.xml"));
+
urls.add(applicationContext.getResource("/WEB-INF/tiles-alt-defs.xml"));
} catch (IOException e) {
throw new DefinitionsFactoryException(
"Cannot load definition URLs", e);
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=676346&r1=676345&r2=676346&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
Sun Jul 13 08:40:30 2008
@@ -24,6 +24,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import javax.el.ArrayELResolver;
import javax.el.CompositeELResolver;
@@ -35,8 +36,8 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import
org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
+import org.apache.tiles.context.ChainedTilesContextFactory;
import org.apache.tiles.context.TilesContextFactory;
-import org.apache.tiles.context.enhanced.EnhancedContextFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.evaluator.AttributeEvaluator;
@@ -46,8 +47,10 @@
import org.apache.tiles.factory.BasicTilesContainerFactory;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.impl.mgmt.CachingTilesContainer;
+import org.apache.tiles.jsp.context.JspTilesContextFactory;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
+import
org.apache.tiles.servlet.context.wildcard.WildcardServletTilesContextFactory;
import org.apache.tiles.test.evaluator.el.MultiversionExpressionFactoryFactory;
import org.apache.tiles.test.renderer.ReverseStringAttributeRenderer;
@@ -59,6 +62,11 @@
public class TestTilesContainerFactory extends BasicTilesContainerFactory {
/**
+ * The count of elements in the Tiles context factory chain.
+ */
+ private static final int CONTEXT_FACTORY_CHAIN_COUNT = 2;
+
+ /**
* The number of URLs to load..
*/
private static final int URL_COUNT = 3;
@@ -71,10 +79,13 @@
/** [EMAIL PROTECTED] */
@Override
- protected TilesContextFactory createContextFactory(Object context) {
- EnhancedContextFactory factory = new EnhancedContextFactory();
- registerChainedContextFactories(context, factory);
- return factory;
+ protected void registerChainedContextFactories(Object context,
+ ChainedTilesContextFactory contextFactory) {
+ List<TilesContextFactory> factories = new
ArrayList<TilesContextFactory>(
+ CONTEXT_FACTORY_CHAIN_COUNT);
+ factories.add(new WildcardServletTilesContextFactory());
+ factories.add(new JspTilesContextFactory());
+ contextFactory.setFactories(factories);
}
/** [EMAIL PROTECTED] */
@@ -125,9 +136,15 @@
TilesContextFactory contextFactory) {
List<URL> urls = new ArrayList<URL>(URL_COUNT);
try {
-
urls.add(applicationContext.getResource("/WEB-INF/tiles-defs.xml"));
-
urls.add(applicationContext.getResource("/org/apache/tiles/classpath-defs.xml"));
-
urls.add(applicationContext.getResource("/WEB-INF/tiles-defs-1.1.xml"));
+ Set<URL> urlSet = applicationContext
+ .getResources("/WEB-INF/tiles-defs*.xml");
+ for (URL url : urlSet) {
+ if (!url.toExternalForm().contains("_")) {
+ urls.add(url);
+ }
+ }
+ urls.add(applicationContext.getResource(
+ "classpath:/org/apache/tiles/classpath-defs.xml"));
} catch (IOException e) {
throw new DefinitionsFactoryException(
"Cannot load definition URLs", e);
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
------------------------------------------------------------------------------
svn:mergeinfo =
