You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2015/01/30 18:38:21 UTC
svn commit: r1656066 - in
/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm:
Logger.java context/ComponentContext.java context/Log.java
impl/FilterComponent.java
Author: pderop
Date: Fri Jan 30 17:38:20 2015
New Revision: 1656066
URL: http://svn.apache.org/r1656066
Log:
Removed the org.apache.felix.dm.context.Log interface, which is now not necessary anymore since the
Logger class is now accessible from the public org.apache.felix.dm API.
Removed:
felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Log.java
Modified:
felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java
felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java?rev=1656066&r1=1656065&r2=1656066&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/Logger.java Fri Jan 30 17:38:20 2015
@@ -21,7 +21,6 @@ package org.apache.felix.dm;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.felix.dm.context.Log;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkUtil;
@@ -48,7 +47,7 @@ import org.osgi.service.log.LogService;
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
-public class Logger implements ServiceListener, Log {
+public class Logger implements ServiceListener {
private static final String LOG_SINGLE_CONTEXT = "org.apache.felix.dependencymanager.singleContextLog";
public static final int LOG_ERROR = 1;
public static final int LOG_WARNING = 2;
@@ -267,54 +266,44 @@ public class Logger implements ServiceLi
return m_debugKey;
}
- // --------------- org.apache.felix.dm.context.Log interface --------------------------------------------
+ // --------------- Convenient helper log methods --------------------------------------------
- @Override
public void err(String format, Object... params) {
log(LogService.LOG_ERROR, String.format(format, params));
}
- @Override
public void err(String format, Throwable err, Object... params) {
log(LogService.LOG_ERROR, String.format(format, params), err);
}
- @Override
public void warn(String format, Object... params) {
log(LogService.LOG_WARNING, String.format(format, params));
}
- @Override
public void warn(String format, Throwable err, Object... params) {
log(LogService.LOG_WARNING, String.format(format, params), err);
}
- @Override
public boolean info() {
return m_enabledLevel >= LogService.LOG_INFO;
}
- @Override
public void info(String format, Object... params) {
log(LogService.LOG_INFO, String.format(format, params));
}
- @Override
public void info(String format, Throwable err, Object... params) {
log(LogService.LOG_INFO, String.format(format, params), err);
}
- @Override
public boolean debug() {
return m_enabledLevel >= LogService.LOG_DEBUG;
}
- @Override
public void debug(String format, Object... params) {
log(LogService.LOG_DEBUG, String.format(format, params));
}
- @Override
public void debug(String format, Throwable err, Object... params) {
log(LogService.LOG_DEBUG, String.format(format, params), err);
}
Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java?rev=1656066&r1=1656065&r2=1656066&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java Fri Jan 30 17:38:20 2015
@@ -23,6 +23,7 @@ import java.util.Set;
import java.util.concurrent.Executor;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.Logger;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -36,7 +37,7 @@ public interface ComponentContext extend
/**
* Returns the logger which can be used by the DependencyManager Dependencies implementations.
*/
- public Log getLogger();
+ public Logger getLogger();
/**
* Returns the Component's bundle context
Modified: felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java?rev=1656066&r1=1656065&r2=1656066&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java (original)
+++ felix/sandbox/pderop/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java Fri Jan 30 17:38:20 2015
@@ -31,11 +31,11 @@ import org.apache.felix.dm.ComponentDepe
import org.apache.felix.dm.ComponentStateListener;
import org.apache.felix.dm.Dependency;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.Logger;
import org.apache.felix.dm.context.ComponentContext;
import org.apache.felix.dm.context.DependencyContext;
import org.apache.felix.dm.context.Event;
import org.apache.felix.dm.context.EventType;
-import org.apache.felix.dm.context.Log;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -343,7 +343,7 @@ public class FilterComponent implements
}
@Override
- public Log getLogger() {
+ public Logger getLogger() {
return m_component.getLogger();
}
}
\ No newline at end of file