Author: apetrelli
Date: Thu Jul 1 19:11:06 2010
New Revision: 959750
URL: http://svn.apache.org/viewvc?rev=959750&view=rev
Log:
VELOCITYSB-4
Added velocity-engine-servlet.
Fixed name of velocity-engine-commons-logging.
Added:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/ (with
props)
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
(with props)
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/resources/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/test/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/test/java/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/test/resources/
Modified:
velocity/sandbox/maven-reorg/engine/trunk/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-commons-logging/pom.xml
Modified: velocity/sandbox/maven-reorg/engine/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/pom.xml?rev=959750&r1=959749&r2=959750&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/pom.xml Thu Jul 1 19:11:06 2010
@@ -158,6 +158,7 @@
<module>velocity-engine-core</module>
<module>velocity-engine-log4j</module>
<module>velocity-engine-commons-logging</module>
+ <module>velocity-engine-servlet</module>
<module>velocity-engine-examples</module>
<module>velocity-engine-assembly</module>
</modules>
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml?rev=959750&r1=959749&r2=959750&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
Thu Jul 1 19:11:06 2010
@@ -43,7 +43,13 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-log-commons-logging</artifactId>
+ <artifactId>velocity-engine-commons-logging</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-servlet</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml?rev=959750&r1=959749&r2=959750&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
(original)
+++
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
Thu Jul 1 19:11:06 2010
@@ -32,8 +32,7 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<includes>
- <include>org.apache.velocity:velocity-engine</include>
- <include>org.apache.velocity:velocity-log-*</include>
+ <include>org.apache.velocity:velocity-engine*</include>
</includes>
</dependencySet>
<dependencySet>
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-commons-logging/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-commons-logging/pom.xml?rev=959750&r1=959749&r2=959750&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-commons-logging/pom.xml
(original)
+++
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-commons-logging/pom.xml
Thu Jul 1 19:11:06 2010
@@ -6,7 +6,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-log-commons-logging</artifactId>
+ <artifactId>velocity-engine-commons-logging</artifactId>
<version>2.0.0-SNAPSHOT</version>
<name>Apache Velocity - Support for logging in Commons Logging</name>
<description>Allows to log in Commons Logging.</description>
Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 1 19:11:06 2010
@@ -0,0 +1,2 @@
+target
+.*
Added: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml?rev=959750&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
(added)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
Thu Jul 1 19:11:06 2010
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>velocity-engine-parent</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-servlet</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>Apache Velocity Engine - Servlet support</name>
+ <description>Support for servlets in Velocity</description>
+ <dependencies>
+ <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
Propchange:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
