From b33cae242c64bb5286f1aad199dd76225791f2db Mon Sep 17 00:00:00 2001 From: slewis Date: Thu, 26 Apr 2018 12:47:29 -0700 Subject: Fix for improper push to master. Change-Id: I878c8386626e40bdbee4b74e8018bd3a524b85f8 --- .../eclipse/ecf/core/util/SystemLogService.java | 22 ++++++++++++++++++++++ .../ethz/iks/slp/impl/OSGiPlatformAbstraction.java | 21 +++++++++++++++++++++ .../remoteservice/eventadmin/LogTracker.java | 22 ++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java index 7826b0891..5524d06dd 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java @@ -13,8 +13,10 @@ package org.eclipse.ecf.core.util; import java.text.SimpleDateFormat; import java.util.Date; +import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; +import org.osgi.service.log.Logger; /** * @@ -100,4 +102,24 @@ public class SystemLogService implements LogService { doLog(sr, level, message, exception); } + public Logger getLogger(String name) { + throw new UnsupportedOperationException(); + } + + public Logger getLogger(Class clazz) { + throw new UnsupportedOperationException(); + } + + public L getLogger(String name, Class loggerType) { + throw new UnsupportedOperationException(); + } + + public L getLogger(Class clazz, Class loggerType) { + throw new UnsupportedOperationException(); + } + + public L getLogger(Bundle bundle, String name, Class loggerType) { + throw new UnsupportedOperationException(); + } + } diff --git a/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java b/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java index cc74014e6..8dc99d864 100644 --- a/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java +++ b/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java @@ -23,6 +23,7 @@ import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; +import org.osgi.service.log.Logger; import ch.ethz.iks.slp.impl.filter.Filter; @@ -217,5 +218,25 @@ public class OSGiPlatformAbstraction implements PlatformAbstraction, log(null, level, message, t); } + public Logger getLogger(String name) { + throw new UnsupportedOperationException(); + } + + public Logger getLogger(Class clazz) { + throw new UnsupportedOperationException(); + } + + public L getLogger(String name, Class loggerType) { + throw new UnsupportedOperationException(); + } + + public L getLogger(Class clazz, Class loggerType) { + throw new UnsupportedOperationException(); + } + + public L getLogger(Bundle bundle, String name, Class loggerType) { + throw new UnsupportedOperationException(); + } + } } diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java index 3bdf952e9..08f68e124 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java @@ -14,9 +14,11 @@ import java.io.PrintStream; import java.util.Calendar; import java.util.Date; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; +import org.osgi.service.log.Logger; import org.osgi.util.tracker.ServiceTracker; /** @@ -62,6 +64,26 @@ public class LogTracker extends ServiceTracker implements LogService { log(reference, level, message, null); } + public Logger getLogger(String name) { + throw new UnsupportedOperationException(); + } + + public Logger getLogger(Class clazz) { + throw new UnsupportedOperationException(); + } + + public L getLogger(String name, Class loggerType) { + throw new UnsupportedOperationException(); + } + + public L getLogger(Class clazz, Class loggerType) { + throw new UnsupportedOperationException(); + } + + public L getLogger(Bundle bundle, String name, Class loggerType) { + throw new UnsupportedOperationException(); + } + public synchronized void log(ServiceReference reference, int level, String message, Throwable exception) { ServiceReference[] references = getServiceReferences(); -- cgit v1.2.3