You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/01/13 07:53:52 UTC

svn commit: r1778503 - /sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

Author: olli
Date: Fri Jan 13 07:53:52 2017
New Revision: 1778503

URL: http://svn.apache.org/viewvc?rev=1778503&view=rev
Log:
SLING-6411 Upgrade Karaf to 4.1

adjust log configuration

Modified:
    sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java?rev=1778503&r1=1778502&r2=1778503&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java Fri Jan 13 07:53:52 2017
@@ -135,9 +135,8 @@ public abstract class KarafTestSupport {
                 .name(karafName())
                 .unpackDirectory(new File("target/paxexam/" + getClass().getSimpleName())),
             keepRuntimeFolder(),
-            logLevel(LogLevel.DEBUG),
             editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bundles.regexp", "^PAXEXAM.*$"),
-            editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG, out, sift, osgi:*"),
+            editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j2.rootLogger.level", "DEBUG"),
             editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "serviceRequirements", "disable"),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(rmiRegistryPort)),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(rmiServerPort)),