You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/03/11 11:32:21 UTC

svn commit: r1576265 - in /myfaces/tobago/branches/tobago-3.0.x: ./ src/docbook/ tobago-core/src/test/resources/ tobago-example/ tobago-example/tobago-example-addressbook/ tobago-example/tobago-example-addressbook/src/main/resources/ tobago-example/tob...

Author: lofwyr
Date: Tue Mar 11 10:32:20 2014
New Revision: 1576265

URL: http://svn.apache.org/r1576265
Log:
Using "logback" instead of "log4j" to run the examples

Added:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/logback-test.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/resources/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/classes/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/resources/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/classes/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/logback.xml
      - copied, changed from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/log4j.xml
Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/classes/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/classes/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/log4j.xml
Modified:
    myfaces/tobago/branches/tobago-3.0.x/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/src/docbook/tobago-tutorial.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/classes/log4j.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/pom.xml Tue Mar 11 10:32:20 2014
@@ -33,6 +33,24 @@
   </prerequisites>
   <url>http://myfaces.apache.org/tobago</url>
   <inceptionYear>2002</inceptionYear>
+
+  <properties>
+    <myfaces-test20.version>1.0.5</myfaces-test20.version>
+    <myfaces20.version>2.0.20</myfaces20.version>
+    <myfaces21.version>2.1.14</myfaces21.version>
+    <myfaces22.version>2.2.0</myfaces22.version>
+    <mojarra20.version>2.0.11</mojarra20.version>
+    <mojarra21.version>2.1.7</mojarra21.version>
+    <mojarra22.version>2.2.2</mojarra22.version>
+    <slf4j.version>1.7.6</slf4j.version>
+    <logback.version>1.1.1</logback.version>
+    <commons-collection.version>3.2.1</commons-collection.version>
+    <maven.compile.source>1.6</maven.compile.source>
+    <maven.compile.target>1.6</maven.compile.target>
+    <maven.compile.encoding>UTF-8</maven.compile.encoding>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <issueManagement>
     <system>jira</system>
     <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=12310273</url>
@@ -184,7 +202,7 @@
             <link>http://jakarta.apache.org/commons/fileupload/apidocs</link>
             <link>http://www.slf4j.org/apidocs</link>
             <link>http://junit.sourceforge.net/javadoc/</link>
-            <link>http://logging.apache.org/log4j/docs/api/</link>
+            <link>http://logback.qos.ch/apidocs/</link>
           </links>
           <excludePackageNames>org.apache.myfaces.tobago.internal.*:org.apache.myfaces.tobago.internal.taglib12.*</excludePackageNames>
           <docletArtifact>
@@ -427,32 +445,17 @@
         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-ext</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>        
-      </dependency>
-      <!-- only needed to build Tobago and for some examples -->
+      <!-- only needed to build Tobago and for some examples, but not for runtime -->
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>2.4</version>
       </dependency>
-      <!-- only needed to build Tobago and for some examples -->
+      <!-- only needed to build Tobago and for some examples, but not for runtime -->
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
@@ -479,11 +482,6 @@
         <version>1.4</version>
       </dependency>
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.8.1</version>
@@ -1407,21 +1405,4 @@
     </contributor>
   </contributors>
 
-  <properties>
-    <myfaces-test20.version>1.0.5</myfaces-test20.version>
-    <myfaces20.version>2.0.20</myfaces20.version>
-    <myfaces21.version>2.1.14</myfaces21.version>
-    <myfaces22.version>2.2.0</myfaces22.version>
-    <mojarra20.version>2.0.11</mojarra20.version>
-    <mojarra21.version>2.1.7</mojarra21.version>
-    <mojarra22.version>2.2.2</mojarra22.version>
-    <slf4j.version>1.7.5</slf4j.version>
-    <logback.version>1.0.11</logback.version>
-    <log4j.version>1.2.17</log4j.version>
-    <commons-collection.version>3.2.1</commons-collection.version>
-    <maven.compile.source>1.6</maven.compile.source>
-    <maven.compile.target>1.6</maven.compile.target>
-    <maven.compile.encoding>UTF-8</maven.compile.encoding>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 </project>

Modified: myfaces/tobago/branches/tobago-3.0.x/src/docbook/tobago-tutorial.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/src/docbook/tobago-tutorial.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/src/docbook/tobago-tutorial.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/src/docbook/tobago-tutorial.xml Tue Mar 11 10:32:20 2014
@@ -169,7 +169,7 @@
     </itemizedlist>
 
     <para>Finally, a logging mechanism has to be selected. All Tobago examples
-    use log4j as a default.</para>
+    use logback as a default.</para>
 
     <sect2>
       <title>Basic Tobago Page</title>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/logback-test.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/logback-test.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/logback-test.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/logback-test.xml Tue Mar 11 10:32:20 2014
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,24 +17,20 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{HH:mm:ss} %15t %-5p - %c:%L - %m%n"/>
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <category name="org.apache.myfaces.tobago">
-    <priority value="debug" />
-  </category>
+  <logger name="org.apache.myfaces.tobago" level="debug"/>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
+  <root level="info">
+    <appender-ref ref="console"/>
   </root>
-
-</log4j:configuration>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml Tue Mar 11 10:32:20 2014
@@ -26,6 +26,10 @@
   <name>Tobago Examples</name>
   <artifactId>tobago-example</artifactId>
 
+  <properties>
+    <logback.version>1.1.1</logback.version>
+  </properties>
+
   <build>
     <!-- NOTE The addressbook run only with mvn jetty:run-exploded.
          For the other examples mvn jetty:run should work.
@@ -83,6 +87,21 @@
     </pluginManagement>
   </build>
 
+  <dependencies>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
   <profiles>
     <profile>
       <id>default-modules</id>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml Tue Mar 11 10:32:20 2014
@@ -28,10 +28,11 @@
   <description>A simple, but full functional application with persistence.</description>
 
   <properties>
-    <openjpa.version>1.0.4</openjpa.version>
+    <openjpa.version>2.3.0</openjpa.version>
     <openwebbeans.version>1.1.7</openwebbeans.version>
     <myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
   </properties>
+
   <build>
     <finalName>tobago-example-addressbook</finalName>
     <plugins>
@@ -243,20 +244,6 @@
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-persistence-jdbc</artifactId>
       <version>${openjpa.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>hsqldb</groupId>
-          <artifactId>hsqldb</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!--dependency>
       <groupId>org.apache.openjpa</groupId>
@@ -309,15 +296,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,26 +17,20 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-             value="%d{HH:mm:ss} %-5p %-50.50c:%-20.20M:%-4.4L %m%n"/>
-      <!-- See http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <category name="org.apache.myfaces.tobago.example.addressbook">
-    <priority value="debug" />
-  </category>
+  <logger name="org.apache.myfaces.tobago.example.addressbook" level="debug"/>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
+  <root level="info">
+    <appender-ref ref="console"/>
   </root>
-
-</log4j:configuration>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml Tue Mar 11 10:32:20 2014
@@ -69,14 +69,5 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>    
   </dependencies>
 </project>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,30 +17,22 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{yyyy-MM-dd HH:mm:ss} %-5p - %c:%L - %m%n"/>
-      <!--
-        %d{...} date pattern
-        %p      priority
-        %m      log message
-        %n      newline
-        -5      fill with spaces (5)
-
-        For more options see class org.apache.log4j.PatternLayout.
-      -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
-  </root>
+<!--
+  <logger name="org.apache.myfaces.tobago" level="debug"/>
+-->
 
-</log4j:configuration>
+  <root level="info">
+    <appender-ref ref="console"/>
+  </root>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml Tue Mar 11 10:32:20 2014
@@ -184,15 +184,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
       <version>2.0.8</version>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,64 +17,20 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-             value="%d{HH:mm:ss} %-5p %-50.50c:%-20.20M:%-4.4L %m%n"/>
-      <!-- See http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-<!--  <category name="org.apache.commons">-->
-<!--    <priority value="info" />-->
-<!--  </category>-->
-
-<!--  <category name="org.apache.myfaces.tobago.example.demo">-->
-<!--    <priority value="debug" />-->
-<!--  </category>-->
-
-<!--  <category name="org.apache.myfaces.tobago.overview">-->
-<!--    <priority value="debug" />-->
-<!--  </category>-->
-
-<!--
-  <category name="org.apache.myfaces.tobago.internal.layout.LayoutContext">
-    <priority value="debug" />
-  </category>
--->
-
-<!--  <category name="org.apache.catalina.core.ApplicationDispatcher">-->
-<!--    <priority value="debug" />-->
-<!--  </category>-->
+  <logger name="org.apache.myfaces.tobago.example.demo" level="debug"/>
 
-  <!--<category name="org.apache.myfaces.tobago.overview">-->
-    <!--<priority value="debug" />-->
-  <!--</category>-->
-
-<!--
-  <category name="org.apache.myfaces.tobago.internal.context.ResourceManagerImpl">
-    <priority value="debug" />
-  </category>
--->
-
-<!--
-  <category name="org.apache.myfaces.tobago.event">
-    <priority value="error" />
-  </category>
-
-  <category name="org.apache.myfaces.tobago.renderkit.CommandRendererBase">
-    <priority value="error" />
-  </category>
--->
-
-  <root>
-    <priority value="info" />
+  <root level="info">
     <appender-ref ref="console" />
   </root>
-
-</log4j:configuration>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/pom.xml Tue Mar 11 10:32:20 2014
@@ -74,11 +74,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>poi</groupId>
       <artifactId>poi</artifactId>
       <version>2.5.1-final-20040804</version>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/classes/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/classes/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/classes/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,31 +17,22 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{yyyy-MM-dd HH:mm:ss} %-5p - %c:%L - %m%n"/>
-      <!--
-        %d{...} date pattern
-        %p      priority
-        %m      log message
-        %n      newline
-        -5      fill with spaces (5)
-
-        For more options see class org.apache.log4j.PatternLayout.
-      -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-<!--
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
-  </root>
+  <!--
+    <logger name="org.apache.myfaces.tobago" level="debug"/>
+  -->
 
-</log4j:configuration>
+  <root level="info">
+    <appender-ref ref="console"/>
+  </root>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/pom.xml Tue Mar 11 10:32:20 2014
@@ -57,10 +57,5 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/classes/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/classes/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/classes/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-nonfacesrequest/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,30 +17,22 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{yyyy-MM-dd HH:mm:ss} %-5p - %c:%L - %m%n"/>
-      <!--
-        %d{...} date pattern
-        %p      priority
-        %m      log message
-        %n      newline
-        -5      fill with spaces (5)
-
-        For more options see class org.apache.log4j.PatternLayout.
-      -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
-  </root>
+  <!--
+    <logger name="org.apache.myfaces.tobago" level="debug"/>
+  -->
 
-</log4j:configuration>
+  <root level="info">
+    <appender-ref ref="console"/>
+  </root>
+</configuration>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-portlet/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,31 +17,22 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{HH:mm:ss} %-5p %-50.50c:%-20.20M:%-4.4L %m%n"/>
-      <!--
-        %d{...} date pattern
-        %p      priority
-        %m      log message
-        %n      newline
-        -5      fill with spaces (5)
-
-        For more options see class org.apache.log4j.PatternLayout.
-        http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html
-      -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
-  </root>
+  <!--
+    <logger name="org.apache.myfaces.tobago" level="debug"/>
+  -->
 
-</log4j:configuration>
+  <root level="info">
+    <appender-ref ref="console"/>
+  </root>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/pom.xml Tue Mar 11 10:32:20 2014
@@ -67,14 +67,5 @@
       <artifactId>tobago-sandbox</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
   </dependencies>
 </project>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-sandbox/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,35 +17,22 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{HH:mm:ss} %-5p %-50.50c:%-20.20M:%-4.4L %m%n"/>
-      <!--
-        %d{...} date pattern
-        %p      priority
-        %m      log message
-        %n      newline
-        -5      fill with spaces (5)
-
-        For more options see class org.apache.log4j.PatternLayout.
-        http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html
-      -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <!--<category name="org.apache.myfaces.tobago.internal.context.ResourceLocator">-->
-    <!--<priority value="info"/>-->
-  <!--</category>-->
+  <!--
+    <logger name="org.apache.myfaces.tobago" level="debug"/>
+  -->
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
+  <root level="info">
+    <appender-ref ref="console"/>
   </root>
-
-</log4j:configuration>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/pom.xml Tue Mar 11 10:32:20 2014
@@ -58,10 +58,5 @@
       <!-- compile or provided depends on the used server -->
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/classes/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/classes/log4j.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/classes/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/classes/log4j.xml Tue Mar 11 10:32:20 2014
@@ -16,35 +16,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-    
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-          value="%d{yyyy-MM-dd HH:mm:ss} %15t %-5p - %c:%L - %m%n"/>
-      <!--
-        %d{...} date pattern
-        %p      priority
-        %m      log message
-        %n      newline
-        -5      fill with spaces (5)
-
-        For more options see class org.apache.log4j.PatternLayout.
-      -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <category name="org.apache.myfaces.tobago.example.security">
-    <priority value="debug" />
-  </category>
+  <logger name="org.apache.myfaces.tobago.example.security" level="debug"/>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
+  <root level="info">
+    <appender-ref ref="console"/>
   </root>
-
-</log4j:configuration>
+</configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml?rev=1576265&r1=1576264&r2=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml Tue Mar 11 10:32:20 2014
@@ -173,15 +173,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
       <version>2.0.8</version>

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/logback.xml (from r1576245, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/logback.xml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/logback.xml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/log4j.xml&r1=1576245&r2=1576265&rev=1576265&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/resources/logback.xml Tue Mar 11 10:32:20 2014
@@ -17,32 +17,20 @@
  * limitations under the License.
 -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration>
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Encoding" value="UTF-8"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern"
-             value="%d{HH:mm:ss} %-5p %-50.50c:%-20.20M:%-4.4L %m%n"/>
-      <!-- See http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html -->
-    </layout>
+<!-- Schema is NOT official from logback -->
+<configuration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.github.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date{ISO8601} [%-16.16thread] %-5level %-50.50logger{50}:%-20.20method:%-4.4line - %msg%n</pattern>
+    </encoder>
   </appender>
 
-  <category name="org.apache.myfaces.tobago.example.test">
-    <priority value="debug" />
-  </category>
-  
-<!--
-  <category name="org.apache.myfaces.tobago.internal.layout.LayoutContext">
-    <priority value="debug" />
-  </category>
--->
+  <logger name="org.apache.myfaces.tobago.example.test" level="debug"/>
 
-  <root>
-    <priority value="info" />
-    <appender-ref ref="console" />
+  <root level="info">
+    <appender-ref ref="console"/>
   </root>
-
-</log4j:configuration>
+</configuration>