Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-26 15:47:29 -0400
committerslewis2018-06-11 17:17:23 -0400
commitff1c17d1eee3c1cf4fc5acaab449f1b6457ac715 (patch)
tree116cd59e896aaaa126104043dfa23e719b71d44f
parent7b39a3ecd1ed27e2214c350325ae62d7ebd2f77d (diff)
downloadorg.eclipse.ecf-ff1c17d1eee3c1cf4fc5acaab449f1b6457ac715.tar.gz
org.eclipse.ecf-ff1c17d1eee3c1cf4fc5acaab449f1b6457ac715.tar.xz
org.eclipse.ecf-ff1c17d1eee3c1cf4fc5acaab449f1b6457ac715.zip
Fix for improper push to master.
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java22
-rw-r--r--protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java21
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java22
3 files changed, 65 insertions, 0 deletions
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 extends Logger> L getLogger(String name, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> 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 extends Logger> L getLogger(String name, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> 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 extends Logger> L getLogger(String name, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
+ public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {
+ throw new UnsupportedOperationException();
+ }
+
public synchronized void log(ServiceReference reference, int level,
String message, Throwable exception) {
ServiceReference[] references = getServiceReferences();

Back to the top