You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2013/03/06 12:36:33 UTC

svn commit: r1453300 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java src/test/resources/logback-test.xml

Author: jukka
Date: Wed Mar  6 11:36:32 2013
New Revision: 1453300

URL: http://svn.apache.org/r1453300
Log:
OAK-624: Run Oak-Jcr tests using the SegmentMK

Direct MongoDB logs to Logback and make them less verbose

Modified:
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
    jackrabbit/oak/trunk/oak-jcr/src/test/resources/logback-test.xml

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1453300&r1=1453299&r2=1453300&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Mar  6 11:36:32 2013
@@ -334,6 +334,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.6.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <version>1.3.158</version>

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java?rev=1453300&r1=1453299&r2=1453300&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java Wed Mar  6 11:36:32 2013
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.test.Abstra
 import org.apache.jackrabbit.test.RepositoryHelper;
 import org.apache.jackrabbit.test.RepositoryHelperPool;
 import org.apache.jackrabbit.test.RepositoryStub;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -34,6 +35,11 @@ import junit.framework.TestSuite;
  */
 public abstract class TCKBase extends TestSuite {
 
+    static {
+        SLF4JBridgeHandler.removeHandlersForRootLogger();
+        SLF4JBridgeHandler.install();
+    }
+
     public TCKBase(String name) {
         super(name);
         addTest(new Setup(OakRepositoryStub.class.getName()));

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/resources/logback-test.xml?rev=1453300&r1=1453299&r2=1453300&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/resources/logback-test.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/resources/logback-test.xml Wed Mar  6 11:36:32 2013
@@ -30,6 +30,7 @@
     </appender>
 
     <logger name="org.apache.jackrabbit.test.api" level="DEBUG"/>
+    <logger name="com.mongodb.tcp" level="ERROR"/>
 
     <root level="INFO">
         <!--