jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r931609 - in /jackrabbit/trunk: jackrabbit-core/ jackrabbit-core/src/test/resources/ jackrabbit-jca/ jackrabbit-jca/src/main/resources/ jackrabbit-jca/src/test/resources/ jackrabbit-jcr-client/ jackrabbit-jcr-rmi/ jackrabbit-jcr-rmi/src/tes...
Date Wed, 07 Apr 2010 16:20:34 GMT
Author: jukka
Date: Wed Apr  7 16:20:33 2010
New Revision: 931609

URL: http://svn.apache.org/viewvc?rev=931609&view=rev
Log:
JCR-2584: Switch from log4j to Logback

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-jca/src/main/resources/
    jackrabbit/trunk/jackrabbit-jca/src/main/resources/logback.xml   (with props)
    jackrabbit/trunk/jackrabbit-jca/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/logback-test.xml   (with props)
    jackrabbit/trunk/jackrabbit-standalone/src/main/resources/logback.xml   (with props)
    jackrabbit/trunk/jackrabbit-webapp/src/main/resources/
    jackrabbit/trunk/jackrabbit-webapp/src/main/resources/logback.xml   (with props)
    jackrabbit/trunk/jackrabbit-webdav/src/test/resources/logback-test.xml   (with props)
Removed:
    jackrabbit/trunk/jackrabbit-core/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-jca/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/log4j.properties
    jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/LoggingServlet.java
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/log4j.dtd
    jackrabbit/trunk/jackrabbit-webdav/src/test/resources/log4j.properties
Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-jca/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-client/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-server/pom.xml
    jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml
    jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
    jackrabbit/trunk/jackrabbit-spi/pom.xml
    jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
    jackrabbit/trunk/jackrabbit-standalone/pom.xml
    jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
    jackrabbit/trunk/jackrabbit-webapp/pom.xml
    jackrabbit/trunk/jackrabbit-webdav/pom.xml

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Wed Apr  7 16:20:33 2010
@@ -251,8 +251,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Added: jackrabbit/trunk/jackrabbit-core/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/logback-test.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,33 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.apache.jackrabbit.test" level="DEBUG"/>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/pom.xml Wed Apr  7 16:20:33 2010
@@ -115,8 +115,8 @@
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Added: jackrabbit/trunk/jackrabbit-jca/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/resources/logback.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/resources/logback.xml (added)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/resources/logback.xml Wed Apr  7 16:20:33 2010
@@ -0,0 +1,30 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="console"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-jca/src/main/resources/logback.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jackrabbit/trunk/jackrabbit-jca/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-jca/src/test/resources/logback-test.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,33 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.apache.jackrabbit.test" level="DEBUG"/>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-jca/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr-client/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-client/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-client/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-client/pom.xml Wed Apr  7 16:20:33 2010
@@ -130,8 +130,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Wed Apr  7 16:20:33 2010
@@ -687,8 +687,8 @@ org.apache.jackrabbit.test.api.version.W
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Added: jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/logback-test.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,31 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/pom.xml Wed Apr  7 16:20:33 2010
@@ -90,8 +90,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Added: jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/logback-test.xml Wed Apr  7
16:20:33 2010
@@ -0,0 +1,31 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml Wed Apr  7 16:20:33 2010
@@ -177,8 +177,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Added: jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/logback-test.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,31 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml Wed Apr  7 16:20:33 2010
@@ -126,11 +126,6 @@
       <version>2.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Wed Apr  7 16:20:33 2010
@@ -40,7 +40,8 @@
   </issueManagement>
 
   <properties>
-    <slf4j.version>1.5.8</slf4j.version>
+    <slf4j.version>1.5.11</slf4j.version>
+    <logback.version>0.9.20</logback.version>
     <jetty.version>6.1.22</jetty.version>
     <tika.version>0.7</tika.version>
   </properties>
@@ -232,13 +233,13 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <artifactId>jcl-over-slf4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${slf4j.version}</version>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>

Modified: jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/pom.xml Wed Apr  7 16:20:33 2010
@@ -159,8 +159,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Added: jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/logback-test.xml Wed Apr  7
16:20:33 2010
@@ -0,0 +1,31 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi/pom.xml Wed Apr  7 16:20:33 2010
@@ -77,14 +77,14 @@
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>
     </dependency>
-        <dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml Wed Apr  7 16:20:33 2010
@@ -147,8 +147,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Added: jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/logback-test.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,31 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-standalone/pom.xml Wed Apr  7 16:20:33 2010
@@ -52,7 +52,7 @@
               org.apache.jackrabbit.standalone
             </Export-Package>
             <Embed-Dependency>
-              *;inline=*.txt|*.html|*.jsp|*.xml|*.jar|*.properties|remoting/**|bootstrap/**|javax/**|repackage/**|images/**|com/**|jline/**|Resources/**|css/**|schema*/**|EDU/**|error/**|org/**|META-INF/*.tld|META-INF/maven/**|META-INF/services/**|WEB-INF/config.xml|WEB-INF/*.properties|WEB-INF/templates/**
+              *;inline=*.txt|*.html|*.jsp|*.xml|*.jar|*.properties|remoting/**|bootstrap/**|javax/**|repackage/**|images/**|com/**|ch/**|jline/**|Resources/**|css/**|schema*/**|EDU/**|error/**|org/**|META-INF/*.tld|META-INF/maven/**|META-INF/services/**|WEB-INF/config.xml|WEB-INF/*.properties|WEB-INF/templates/**
             </Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Main-Class>org.apache.jackrabbit.standalone.Main</Main-Class>

Modified: jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
(original)
+++ jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Wed Apr  7 16:20:33 2010
@@ -37,11 +37,6 @@ import org.apache.jackrabbit.core.config
 import org.apache.jackrabbit.servlet.jackrabbit.JackrabbitRepositoryServlet;
 import org.apache.jackrabbit.standalone.cli.CommandHelper;
 import org.apache.jackrabbit.standalone.cli.JcrClient;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.NCSARequestLog;
 import org.mortbay.jetty.Server;
@@ -206,24 +201,15 @@ public class Main {
 
     private void prepareServerLog(File log)
             throws IOException {
-        Layout layout =
-            new PatternLayout("%d{dd.MM.yyyy HH:mm:ss} *%-5p* %c{1}: %m%n");
-
-        Logger jackrabbitLog = Logger.getRootLogger();
-        jackrabbitLog.addAppender(new FileAppender(
-                layout, new File(log, "jackrabbit.log").getPath()));
-
-        Logger jettyLog = Logger.getLogger("org.mortbay.log");
-        jettyLog.addAppender(new FileAppender(
-                layout, new File(log, "jetty.log").getPath()));
-        jettyLog.setAdditivity(false);
+        System.setProperty(
+                "jackrabbit.log", new File(log, "jackrabbit.log").getPath());
+        System.setProperty(
+                "jetty.log", new File(log, "jetty.log").getPath());
 
         if (command.hasOption("debug")) {
-            jackrabbitLog.setLevel(Level.DEBUG);
-            jettyLog.setLevel(Level.DEBUG);
+            System.setProperty("log.level", "DEBUG");
         } else {
-            jackrabbitLog.setLevel(Level.INFO);
-            jettyLog.setLevel(Level.INFO);
+            System.setProperty("log.level", "INFO");
         }
 
         System.setProperty(

Added: jackrabbit/trunk/jackrabbit-standalone/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/src/main/resources/logback.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/src/main/resources/logback.xml (added)
+++ jackrabbit/trunk/jackrabbit-standalone/src/main/resources/logback.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,42 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="jackrabbit" class="ch.qos.logback.core.FileAppender">
+    <file>${jackrabbit.log}</file>
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="jetty" class="ch.qos.logback.core.FileAppender">
+    <file>${jetty.log}</file>
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.mortbay.log" level="${log.level}" additivity="false">
+    <appender-ref ref="jetty"/>
+  </logger>
+
+  <root level="${log.level}">
+    <appender-ref ref="jackrabbit"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-standalone/src/main/resources/logback.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Wed Apr  7 16:20:33 2010
@@ -43,6 +43,17 @@
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <version>2.2-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
@@ -60,8 +71,8 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Added: jackrabbit/trunk/jackrabbit-webapp/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/resources/logback.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/resources/logback.xml (added)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/resources/logback.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,30 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="console"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-webapp/src/main/resources/logback.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/pom.xml?rev=931609&r1=931608&r2=931609&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webdav/pom.xml Wed Apr  7 16:20:33 2010
@@ -86,8 +86,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Added: jackrabbit/trunk/jackrabbit-webdav/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/test/resources/logback-test.xml?rev=931609&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/test/resources/logback-test.xml (added)
+++ jackrabbit/trunk/jackrabbit-webdav/src/test/resources/logback-test.xml Wed Apr  7 16:20:33
2010
@@ -0,0 +1,31 @@
+<?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
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  -->
+<configuration>
+
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/jcr.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
+
+</configuration>

Propchange: jackrabbit/trunk/jackrabbit-webdav/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message