svn commit: r1043123 - in /velocity/engine/trunk: src/site/xdoc/user-guide.xml velocity-engine-assembly/pom.xml velocity-engine-assembly/src/main/assembly/all.xml

[apetrelli]

Author: apetrelli
Date: Tue Dec  7 16:43:34 2010
New Revision: 1043123

URL: http://svn.apache.org/viewvc?rev=1043123&view=rev
Log:
VELOCITY-621
Added velocity-engine-slf4j to user guide and assembly.

Modified:
    velocity/engine/trunk/src/site/xdoc/user-guide.xml
    velocity/engine/trunk/velocity-engine-assembly/pom.xml
    velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml

Modified: velocity/engine/trunk/src/site/xdoc/user-guide.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/site/xdoc/user-guide.xml?rev=1043123&r1=1043122&r2=1043123&view=diff
==============================================================================
--- velocity/engine/trunk/src/site/xdoc/user-guide.xml (original)
+++ velocity/engine/trunk/src/site/xdoc/user-guide.xml Tue Dec  7 16:43:34 2010
@@ -249,7 +249,7 @@ Hello $customer.Name!
   <version>x.x.x</version>
 </dependency>]]>
     </source>
-    <p>If you want to connect Velocity log facility to Commons Logging, Log4j 
or the servlet logger,
+    <p>If you want to connect Velocity log facility to Commons Logging, SLF4J, 
Log4j or the servlet logger,
     choose the appropriate dependency:</p>
     <source><![CDATA[
 <dependency>
@@ -260,6 +260,12 @@ Hello $customer.Name!
 
 <dependency>
   <groupId>org.apache.velocity</groupId>
+  <artifactId>velocity-engine-slf4j</artifactId>
+  <version>x.x.x</version>
+</dependency>
+
+<dependency>
+  <groupId>org.apache.velocity</groupId>
   <artifactId>velocity-engine-log4j</artifactId>
   <version>x.x.x</version>
 </dependency>
@@ -290,6 +296,9 @@ Hello $customer.Name!
                <li><strong>velocity-engine-commons-logging-x.x.x.jar</strong>: 
It contains the binding to
                Commons Logging, so all log messages will be directed to it. To 
be used in
                conjunction with Commons Logging (included in "lib" 
directory).</li>
+        <li><strong>velocity-engine-slf4j-x.x.x.jar</strong>: It contains the 
binding to
+        SLF4J, so all log messages will be directed to it. To be used in
+        conjunction with SLF4J (included in "lib" directory).</li>
                <li><strong>velocity-engine-log4j-x.x.x.jar</strong>: It 
contains the binding to
                Log4j, so all log messages will be directed to it. To be used in
                conjunction with Log4j (included in "lib" directory).</li>

Modified: velocity/engine/trunk/velocity-engine-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/pom.xml?rev=1043123&r1=1043122&r2=1043123&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/pom.xml Tue Dec  7 16:43:34 
2010
@@ -57,6 +57,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-slf4j</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>

Modified: 
velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml?rev=1043123&r1=1043122&r2=1043123&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml 
(original)
+++ velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml 
Tue Dec  7 16:43:34 2010
@@ -36,7 +36,7 @@
             </includes>
             <excludes>
                 <exclude>org.apache.velocity:velocity-engine-uberjar</exclude>
-                <include>org.apache.velocity:velocity-engine-examples</include>
+                <exclude>org.apache.velocity:velocity-engine-examples</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
@@ -97,6 +97,14 @@
             </includes>
         </fileSet>
         <fileSet>
+            <directory>../velocity-engine-slf4j</directory>
+            <outputDirectory>src/velocity-engine-sl4j</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
             <directory>../velocity-engine-log4j</directory>
             <outputDirectory>src/velocity-engine-log4j</outputDirectory>
             <includes>
@@ -151,6 +159,10 @@
             
<outputDirectory>docs/velocity-engine-commons-logging</outputDirectory>
         </fileSet>
         <fileSet>
+            <directory>../velocity-engine-slf4j/target/site</directory>
+            <outputDirectory>docs/velocity-engine-slf4j</outputDirectory>
+        </fileSet>
+        <fileSet>
             <directory>../velocity-engine-log4j/target/site</directory>
             <outputDirectory>docs/velocity-engine-log4j</outputDirectory>
         </fileSet>