Author: hlship
Date: Tue Jun 24 14:04:43 2008
New Revision: 671343

URL: http://svn.apache.org/viewvc?rev=671343&view=rev
Log:
TAPESTRY-2479: Upgrade to SLF4J version 1.5.2 (supports older versions of Log4J 
better)

Modified:
    tapestry/tapestry5/trunk/src/site/apt/jetty.apt
    tapestry/tapestry5/trunk/tapestry-ioc/pom.xml

Modified: tapestry/tapestry5/trunk/src/site/apt/jetty.apt
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/apt/jetty.apt?rev=671343&r1=671342&r2=671343&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/apt/jetty.apt (original)
+++ tapestry/tapestry5/trunk/src/site/apt/jetty.apt Tue Jun 24 14:04:43 2008
@@ -9,12 +9,16 @@
   The easiest way to develop Tapestry applications is to run Jetty <embedded> 
inside your IDE. If you use Eclipse,
   then {{{http://jettylauncher.sourceforge.net/}the Jetty Launcher plugin}} is 
invaluable.  The
   {{{tutorial1/}Tapestry 5 Tutorial}}  discusses installing and using Jetty 
Launcher.
-  
+
   Jetty Launcher  only works  with Jetty <<4 or 5>> and <<not>> Jetty 6.
-  
+
+  A newer and better maintained and supported Eclipse plugin,
+  {{{http://code.google.com/p/run-jetty-run/}Run Jetty Run}} is now available. 
It allows Jetty to be used without
+  a seperate Jetty install.
+
 * Logging
 
-  Tapestry, in its default configuration, requires Log4J version 1.2.12 or 
better
+  Tapestry, in its default configuration, expects Log4J version 1.2.12 or 
better
   (it makes use of the 
   
{{{http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Logger.html#isTraceEnabled()}isTraceEnabled()}}
 and
   
{{http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Logger.html#trace(java.lang.Object)}trace()}}
 methods,
@@ -22,4 +26,8 @@
   
   You may have to replace the version of Log4J in your Jetty's ext directory 
with a newer version.
 
+  If you enable debugging output for your page and are using an older version 
of Log4J, you will see output
+  in the console an incredible amount of trace output concerning every aspect 
of rendering the page; this is because
+  with Log4J 1.2.11 and earlier, the trace output level is merged into the 
debug output level.
+
   
\ No newline at end of file

Modified: tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/pom.xml?rev=671343&r1=671342&r2=671343&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/pom.xml Tue Jun 24 14:04:43 2008
@@ -1,4 +1,5 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns="http://maven.apache.org/POM/4.0.0";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns="http://maven.apache.org/POM/4.0.0";>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.tapestry</groupId>
     <artifactId>tapestry-ioc</artifactId>
@@ -32,29 +33,24 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.4.3</version>
-        </dependency>
-
-        <!-- 0.00001% of applications will need to override this dependency to 
not use Log4J. -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.4.3</version>
-            <exclusions>
-                <!-- Exclude log4j to make sure we use the latest Log4J 
version. -->
-                <exclusion>
-                    <artifactId>log4j</artifactId>
-                    <groupId>log4j</groupId>
-                </exclusion>
-            </exclusions>
+            <version>1.5.2</version>
         </dependency>
 
+        <!-- SLF4J now supports earlier versions of Log4J more cleanly, but 
still nice to include
+             a fully compatible version. -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.14</version>
         </dependency>
 
+        <!-- 0.00001% of applications will need to override this dependency to 
not use Log4J. -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+
 
         <!-- Override parent pom: needed at compile time. -->
         <dependency>


Reply via email to