svn commit: r1522613 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java

[ui...@apache.org]

Author: uiterlix
Date: Thu Sep 12 15:23:30 2013
New Revision: 1522613

URL: http://svn.apache.org/r1522613
Log:
FELIX-4226 Add option to have the dependency manager log against a single BundleContext's LogService.

Modified:
    felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java

Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java?rev=1522613&r1=1522612&r2=1522613&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/Logger.java Thu Sep 12 15:23:30 2013
@@ -21,8 +21,10 @@ package org.apache.felix.dm.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
@@ -46,6 +48,7 @@ import org.osgi.framework.ServiceReferen
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
 public class Logger implements ServiceListener {
+	private static final String LOG_SINGLE_CONTEXT = "org.apache.felix.dm.singleContextLog";
     public static final int LOG_ERROR = 1;
     public static final int LOG_WARNING = 2;
     public static final int LOG_INFO = 3;
@@ -59,7 +62,11 @@ public class Logger implements ServiceLi
     private Object[] m_logger = null;
 
     public Logger(BundleContext context) {
-        m_context = context;
+    	if ("true".equals(System.getProperty(LOG_SINGLE_CONTEXT))) {
+    		m_context = FrameworkUtil.getBundle(DependencyManager.class).getBundleContext();
+    	} else {
+    		m_context = context;
+    	}
         startListeningForLogService();
     }