Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/osgi
diff options
context:
space:
mode:
authorslewis2018-02-25 21:08:34 -0500
committerslewis2018-02-25 21:08:34 -0500
commitc0972cf1a71433d388f54ee0bf0f203785183261 (patch)
tree389c1312e506a509be8ab56b7555936904ab60a0 /osgi
parent1fbeb1e553289123d19855f95a9a7de9f98fafde (diff)
downloadorg.eclipse.ecf-c0972cf1a71433d388f54ee0bf0f203785183261.tar.gz
org.eclipse.ecf-c0972cf1a71433d388f54ee0bf0f203785183261.tar.xz
org.eclipse.ecf-c0972cf1a71433d388f54ee0bf0f203785183261.zip
Further fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=531649
Removed dependency on slf4j Change-Id: I0000000000000000000000000000000000000000
Diffstat (limited to 'osgi')
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF1
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java14
2 files changed, 7 insertions, 8 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index 120259264..74dd706ec 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -32,7 +32,6 @@ Import-Package: javax.xml.parsers,
org.osgi.service.log,
org.osgi.service.remoteserviceadmin;version="1.1",
org.osgi.util.tracker,
- org.slf4j;version="1.7.2",
org.xml.sax
DynamicImport-Package: *
Bundle-ActivationPolicy: lazy
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java
index e0af2de5d..fb2d1517a 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java
@@ -21,6 +21,8 @@ import java.util.Map;
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.ecf.internal.osgi.services.remoteserviceadmin.DebugOptions;
+import org.eclipse.ecf.internal.osgi.services.remoteserviceadmin.LogUtility;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceEvent;
@@ -32,8 +34,6 @@ import org.osgi.service.remoteserviceadmin.EndpointEvent;
import org.osgi.service.remoteserviceadmin.EndpointEventListener;
import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent;
import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @since 4.6
@@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
public class TopologyManager
implements EventListenerHook, RemoteServiceAdminListener, ITopologyManager {
- protected static final Logger logger = LoggerFactory.getLogger(TopologyManager.class);
-
class EndpointEventHolder {
private final EndpointDescription endpointDescription;
private final String filter;
@@ -100,9 +98,11 @@ public class TopologyManager
}
private void logError(String methodName, String message, Throwable e) {
- logger.error(((methodName == null) ? "<unknown>" //$NON-NLS-1$
- : methodName) + ":" //$NON-NLS-1$
- + ((message == null) ? "<empty>" //$NON-NLS-1$
+ LogUtility.logError(((methodName == null) ? "<unknown>" //$NON-NLS-1$
+ : methodName),
+ DebugOptions.TOPOLOGY_MANAGER,
+ TopologyManager.class,
+ ((message == null) ? "<empty>" //$NON-NLS-1$
: message),
e);
}

Back to the top