Author: apetrelli
Date: Wed Jun 30 14:00:31 2010
New Revision: 959312
URL: http://svn.apache.org/viewvc?rev=959312&view=rev
Log:
VELOCITYSB-4
Moved Log4jLogChute to velocity-log-log4j.
Added:
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/src/main/java/org/
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/src/main/java/org/apache/
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/src/main/java/org/apache/velocity/
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/src/main/java/org/apache/velocity/runtime/
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/src/main/java/org/apache/velocity/runtime/log/
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java
- copied unchanged from r957249,
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java
Removed:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java
Modified:
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/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/pom.xml
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=959312&r1=959311&r2=959312&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
Wed Jun 30 14:00:31 2010
@@ -37,6 +37,12 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-log-log4j</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-examples</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
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=959312&r1=959311&r2=959312&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
Wed Jun 30 14:00:31 2010
@@ -33,6 +33,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>org.apache.velocity:velocity-engine</include>
+ <include>org.apache.velocity:velocity-log-*</include>
</includes>
</dependencySet>
<dependencySet>
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml?rev=959312&r1=959311&r2=959312&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml Wed Jun
30 14:00:31 2010
@@ -61,12 +61,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
@@ -87,7 +81,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/pom.xml?rev=959312&r1=959311&r2=959312&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/pom.xml
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-log-log4j/pom.xml Wed
Jun 30 14:00:31 2010
@@ -10,4 +10,16 @@
<version>2.0.0-SNAPSHOT</version>
<name>Apache Velocity - Support for logging in Log4j</name>
<description>LogChute implementation for Log4j.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
