You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2013/11/13 09:43:03 UTC
svn commit: r1541423 - in /karaf/trunk/main/src:
main/java/org/apache/karaf/main/ main/java/org/apache/karaf/main/util/
test/java/org/apache/karaf/main/util/ test/resources/
test/resources/test-karaf-home/etc/
Author: cschneider
Date: Wed Nov 13 08:43:03 2013
New Revision: 1541423
URL: http://svn.apache.org/r1541423
Log:
KARAF-2572 Fix side effect from BootstrapLogManagerTest
Added:
karaf/trunk/main/src/test/resources/org.ops4j.pax.logging.cfg
- copied unchanged from r1541411, karaf/trunk/main/src/test/resources/test-karaf-home/etc/org.ops4j.pax.logging.cfg
Removed:
karaf/trunk/main/src/test/resources/test-karaf-home/etc/org.ops4j.pax.logging.cfg
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
karaf/trunk/main/src/test/java/org/apache/karaf/main/util/BootstrapLogManagerTest.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1541423&r1=1541422&r2=1541423&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Wed Nov 13 08:43:03 2013
@@ -217,7 +217,8 @@ public class Main {
if (config.delayConsoleStart) {
System.out.println(config.startupMessage);
}
- BootstrapLogManager.setProperties(config.props);
+ String log4jConfigPath = System.getProperty("karaf.base") + "/etc/org.ops4j.pax.logging.cfg";
+ BootstrapLogManager.setProperties(config.props, log4jConfigPath);
lock = createLock();
lockCallback = new KarafLockCallback();
InstanceHelper.updateInstancePid(config.karafHome, config.karafBase);
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java?rev=1541423&r1=1541422&r2=1541423&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java Wed Nov 13 08:43:03 2013
@@ -41,9 +41,11 @@ public class BootstrapLogManager {
private static BootstrapLogManager instance;
private Handler handler;
private Properties configProps;
+ private String log4jConfigPath;
- public BootstrapLogManager(Properties configProps) {
+ public BootstrapLogManager(Properties configProps, String log4jConfigPath) {
this.configProps = configProps;
+ this.log4jConfigPath = log4jConfigPath;
this.handler = null;
}
@@ -55,8 +57,12 @@ public class BootstrapLogManager {
}
public static void setProperties(Properties configProps) {
- instance = new BootstrapLogManager(configProps);
+ setProperties(configProps, null);
}
+
+ public static void setProperties(Properties configProps, String log4jConfigPath) {
+ instance = new BootstrapLogManager(configProps, log4jConfigPath);
+ }
private Handler getDefaultHandlerInternal() {
if (handler != null) {
@@ -64,7 +70,7 @@ public class BootstrapLogManager {
}
String filename = getLogFilePath();
- filename = SubstHelper.substVars(filename, LOG4J_APPENDER_FILE, null, null);
+ filename = SubstHelper.substVars(filename, LOG4J_APPENDER_FILE, null, configProps);
File logFile = new File(filename);
try {
return new SimpleFileHandler(logFile);
@@ -73,11 +79,11 @@ public class BootstrapLogManager {
}
}
- private static Properties loadPaxLoggingConfig() {
+ private Properties loadPaxLoggingConfig() {
Properties props = new Properties();
FileInputStream fis = null;
try {
- fis = new FileInputStream(System.getProperty("karaf.base") + "/etc/org.ops4j.pax.logging.cfg");
+ fis = new FileInputStream(log4jConfigPath);
props.load(fis);
} catch (Exception e) {
// Ignore
Modified: karaf/trunk/main/src/test/java/org/apache/karaf/main/util/BootstrapLogManagerTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/test/java/org/apache/karaf/main/util/BootstrapLogManagerTest.java?rev=1541423&r1=1541422&r2=1541423&view=diff
==============================================================================
--- karaf/trunk/main/src/test/java/org/apache/karaf/main/util/BootstrapLogManagerTest.java (original)
+++ karaf/trunk/main/src/test/java/org/apache/karaf/main/util/BootstrapLogManagerTest.java Wed Nov 13 08:43:03 2013
@@ -21,19 +21,22 @@ package org.apache.karaf.main.util;
import java.io.File;
import java.util.Properties;
import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
import junit.framework.Assert;
import org.junit.Test;
public class BootstrapLogManagerTest {
-
+
+ private Properties getConfigProperties() {
+ Properties configProps = new Properties();
+ configProps.put("karaf.data", "target");
+ return configProps;
+ }
+
@Test
public void testGetLogManagerNoProperties() {
- System.setProperty("karaf.data", "target");
- BootstrapLogManager.setProperties(null);
+ BootstrapLogManager.setProperties(getConfigProperties());
try {
BootstrapLogManager.getDefaultHandler();
} catch (IllegalStateException e) {
@@ -44,9 +47,7 @@ public class BootstrapLogManagerTest {
@Test
public void testGetLogManager() {
new File("target/log/karaf.log").delete();
- System.setProperty("karaf.data", "target");
- Properties configProps = new Properties();
- BootstrapLogManager.setProperties(configProps);
+ BootstrapLogManager.setProperties(getConfigProperties());
Handler handler = BootstrapLogManager.getDefaultHandler();
Assert.assertNotNull(handler);
assertExists("target/log/karaf.log");
@@ -55,9 +56,8 @@ public class BootstrapLogManagerTest {
@Test
public void testGetLogManagerFromPaxLoggingConfig() {
new File("target/test.log").delete();
- System.setProperty("karaf.base", "src/test/resources/test-karaf-home");
- Properties configProps = new Properties();
- BootstrapLogManager.setProperties(configProps);
+ Properties configProps = getConfigProperties();
+ BootstrapLogManager.setProperties(configProps, "src/test/resources/org.ops4j.pax.logging.cfg");
Handler handler = BootstrapLogManager.getDefaultHandler();
Assert.assertNotNull(handler);
assertExists("target/test.log");