You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by ap...@apache.org on 2010/07/10 16:16:13 UTC

svn commit: r962847 - in /velocity/sandbox/maven-reorg/tools/trunk: examples/struts/ velocity-tools-examples/velocity-tools-examples-struts/ velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/ velocity-tools-examples/velocity...

Author: apetrelli
Date: Sat Jul 10 14:16:13 2010
New Revision: 962847

URL: http://svn.apache.org/viewvc?rev=962847&view=rev
Log:
VELOCITYSB-5
Moved code to struts example module.

Added:
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/
      - copied from r962811, velocity/sandbox/maven-reorg/tools/trunk/examples/struts/WEB-INF/src/examples/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/commons-logging.properties
      - copied unchanged from r962811, velocity/sandbox/maven-reorg/tools/trunk/examples/struts/WEB-INF/src/commons-logging.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/
      - copied from r962811, velocity/sandbox/maven-reorg/tools/trunk/examples/struts/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/src/main/java/META-INF/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/src/main/java/META-INF/MANIFEST.MF
Removed:
    velocity/sandbox/maven-reorg/tools/trunk/examples/struts/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/WEB-INF/src/
Modified:
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/WEB-INF/web.xml

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml?rev=962847&r1=962846&r2=962847&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml Sat Jul 10 14:16:13 2010
@@ -11,4 +11,17 @@
   <packaging>war</packaging>
   <name>Apache Velocity Tools Examples - Struts</name>
   <description>Webapp based on Velocity Tools - Struts support.</description>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.apache.velocity</groupId>
+  		<artifactId>velocity-tools-struts</artifactId>
+  		<version>2.1.0-SNAPSHOT</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>javax.servlet</groupId>
+  		<artifactId>servlet-api</artifactId>
+  		<version>2.3</version>
+  		<scope>provided</scope>
+  	</dependency>
+  </dependencies>
 </project>
\ No newline at end of file

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/WEB-INF/web.xml?rev=962847&r1=962811&r2=962847&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/WEB-INF/web.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/webapp/WEB-INF/web.xml Sat Jul 10 14:16:13 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one

Added: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/src/main/java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/src/main/java/META-INF/MANIFEST.MF?rev=962847&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/src/main/java/META-INF/MANIFEST.MF (added)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/src/main/java/META-INF/MANIFEST.MF Sat Jul 10 14:16:13 2010
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+