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/09/29 17:56:31 UTC
svn commit: r820000 - in /tiles/framework/trunk/tiles-test-pom: tiles-test-alt/ tiles-test-alt/src/main/java/org/apache/tiles/test/alt/ tiles-test-alt/src/main/resources/org/ tiles-test-alt/src/main/resources/org/apache/ tiles-test-alt/src/main/resourc...

Author: apetrelli
Date: Tue Sep 29 15:56:31 2009
New Revision: 820000

URL: http://svn.apache.org/viewvc?rev=820000&view=rev
Log:
TILES-469
Moved "alternate" definitions to "tiles-test-alt" module.

Added:
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml
      - copied unchanged from r819611, tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml
      - copied unchanged from r819611, tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml
      - copied unchanged from r819611, tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml
Removed:
    tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml
    tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
    tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml
Modified:
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
    tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java

Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml?rev=820000&r1=819999&r2=820000&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml Tue Sep 29 15:56:31 2009
@@ -59,5 +59,10 @@
        <artifactId>tiles-test-common</artifactId>
        <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java?rev=820000&r1=819999&r2=820000&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java Tue Sep 29 15:56:31 2009
@@ -52,9 +52,9 @@
             TilesRequestContextFactory contextFactory) {
         List<URL> urls = new ArrayList<URL>(URL_COUNT);
         try {
-            urls.add(applicationContext.getResource("/WEB-INF/tiles-alt-defs.xml"));
-            urls.add(applicationContext.getResource("/WEB-INF/freemarker/tiles-alt-defs.xml"));
-            urls.add(applicationContext.getResource("/WEB-INF/velocity/tiles-alt-defs.xml"));
+            urls.add(applicationContext.getResource("classpath:/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml"));
+            urls.add(applicationContext.getResource("classpath:/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml"));
+            urls.add(applicationContext.getResource("classpath:/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml"));
         } catch (IOException e) {
             throw new DefinitionsFactoryException(
                     "Cannot load definition URLs", e);

Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java?rev=820000&r1=819999&r2=820000&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java Tue Sep 29 15:56:31 2009
@@ -1,7 +1,10 @@
 package org.apache.tiles.test.alt;
 
+import javax.servlet.ServletContext;
+
 import org.apache.tiles.TilesApplicationContext;
 import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
 import org.apache.tiles.startup.AbstractTilesInitializer;
 
 /**
@@ -24,4 +27,12 @@
             TilesApplicationContext applicationContext) {
         return "alternate";
     }
+
+    /** {@inheritDoc} */
+    @Override
+    protected TilesApplicationContext createTilesApplicationContext(
+            TilesApplicationContext preliminaryContext) {
+        return new WildcardServletTilesApplicationContext(
+                (ServletContext) preliminaryContext.getContext());
+    }
 }
\ No newline at end of file