Author: apetrelli
Date: Mon Jul 12 18:22:43 2010
New Revision: 963414
URL: http://svn.apache.org/viewvc?rev=963414&view=rev
Log:
VELOCITYSB-5
Moved code in example for struts.
Removed transitive dependency from sslext to struts 1.2.7
Added:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app1/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app1/ApplicationResources.properties
- copied unchanged from r963405,
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app1/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app1/ApplicationResources_de.properties
- copied unchanged from r963405,
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app1/ApplicationResources_de.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app2/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app2/ApplicationResources.properties
- copied unchanged from r963405,
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app2/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app3/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app3/ApplicationResources.properties
- copied unchanged from r963405,
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app3/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app4/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app4/ApplicationResources.properties
- copied unchanged from r963405,
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app4/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/resources/examples/app5/
- copied from r963405,
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app5/
Removed:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app1/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app1/ApplicationResources_de.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app2/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app3/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app4/ApplicationResources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/src/main/java/examples/app5/
Modified:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.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=963414&r1=963413&r2=963414&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
Mon Jul 12 18:22:43 2010
@@ -11,17 +11,26 @@
<packaging>war</packaging>
<name>Apache Velocity Tools Examples - Struts</name>
<description>Webapp based on Velocity Tools - Struts support.</description>
+ <build>
+ <finalName>velocity-tools-examples-struts</finalName>
+ </build>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <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>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view-jsp</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml?rev=963414&r1=963413&r2=963414&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml
(original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml Mon
Jul 12 18:22:43 2010
@@ -36,6 +36,12 @@
<groupId>sslext</groupId>
<artifactId>sslext</artifactId>
<version>1.2-0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>struts</artifactId>
+ <groupId>struts</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
