SLING-6411 Upgrade Karaf to 4.1
authorOliver Lietz <olli@apache.org>
Fri, 13 Jan 2017 07:53:52 +0000 (07:53 +0000)
committerOliver Lietz <olli@apache.org>
Fri, 13 Jan 2017 07:53:52 +0000 (07:53 +0000)
adjust log configuration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1778503 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

index 6b8557c..3457c47 100644 (file)
@@ -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)),