You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/11/10 22:03:08 UTC

svn commit: r834665 - in /tiles/sandbox/trunk: tiles-request/tiles-request-freemarker/ tiles-request/tiles-request-freemarker/src/test/java/org/ tiles-request/tiles-request-freemarker/src/test/java/org/apache/ tiles-request/tiles-request-freemarker/src...

Author: apetrelli
Date: Tue Nov 10 21:03:07 2009
New Revision: 834665

URL: http://svn.apache.org/viewvc?rev=834665&view=rev
Log:
TILESSB-12
Moved code from tiles-velocity a tiles-request-velocity.
Moved test code from tiles-freemarker to tiles-request-freemarker.

Added:
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java
      - copied unchanged from r834638, tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
      - copied unchanged from r834216, tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
      - copied unchanged from r834216, tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
      - copied unchanged from r834216, tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
      - copied unchanged from r834216, tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java
      - copied unchanged from r834216, tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java
      - copied unchanged from r834216, tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java
Removed:
    tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerRequestUtilTest.java
    tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
    tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
    tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
    tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
    tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactoryTest.java
    tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextTest.java
Modified:
    tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml
    tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml
    tiles/sandbox/trunk/tiles3/tiles-velocity/pom.xml

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml?rev=834665&r1=834664&r2=834665&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/pom.xml Tue Nov 10 21:03:07 2009
@@ -38,5 +38,23 @@
   		<version>1.5.8</version>
   		<optional>true</optional>
   	</dependency>
+  	<dependency>
+  		<groupId>junit</groupId>
+  		<artifactId>junit</artifactId>
+  		<version>4.7</version>
+  		<scope>test</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.easymock</groupId>
+  		<artifactId>easymock</artifactId>
+  		<version>2.5.2</version>
+  		<scope>test</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.easymock</groupId>
+  		<artifactId>easymockclassextension</artifactId>
+  		<version>2.4</version>
+  		<scope>test</scope>
+  	</dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml?rev=834665&r1=834664&r2=834665&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-velocity/pom.xml Tue Nov 10 21:03:07 2009
@@ -10,4 +10,40 @@
   <version>1.0-SNAPSHOT</version>
   <name>Tiles Request - Velocity support</name>
   <description>Velocity implementation of the Tiles request framework</description>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.apache.velocity</groupId>
+  		<artifactId>velocity-tools</artifactId>
+  		<version>2.0-SNAPSHOT</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.tiles</groupId>
+  		<artifactId>tiles-request-servlet</artifactId>
+  		<version>1.0-SNAPSHOT</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>javax.servlet</groupId>
+  		<artifactId>servlet-api</artifactId>
+  		<version>2.5</version>
+  		<scope>provided</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>junit</groupId>
+  		<artifactId>junit</artifactId>
+  		<version>4.7</version>
+  		<scope>test</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.easymock</groupId>
+  		<artifactId>easymock</artifactId>
+  		<version>2.5.2</version>
+  		<scope>test</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.easymock</groupId>
+  		<artifactId>easymockclassextension</artifactId>
+  		<version>2.4</version>
+  		<scope>test</scope>
+  	</dependency>
+  </dependencies>
 </project>
\ No newline at end of file

Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/pom.xml?rev=834665&r1=834664&r2=834665&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/pom.xml Tue Nov 10 21:03:07 2009
@@ -137,5 +137,10 @@
       <version>2.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+    	<groupId>org.apache.tiles</groupId>
+    	<artifactId>tiles-request-velocity</artifactId>
+    	<version>1.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file