Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-26 15:36:29 -0400
committerslewis2018-04-26 15:36:29 -0400
commitf6848ce77fd780316123d1d20ef5b12a86bef797 (patch)
tree66b58a1de0890a106614dde68f36c76d2dad1efc
parentce4318cdbbb7e1a47dc3c6d295117b254607fcd3 (diff)
downloadorg.eclipse.ecf-f6848ce77fd780316123d1d20ef5b12a86bef797.tar.gz
org.eclipse.ecf-f6848ce77fd780316123d1d20ef5b12a86bef797.tar.xz
org.eclipse.ecf-f6848ce77fd780316123d1d20ef5b12a86bef797.zip
Removed use of org.osgi.service.log.Logger from master branch. It was
added in error. Change-Id: I6e6c0f6cfdb16ffc8ab2ac88fb77cba4b0c6e4d6
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java22
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rpc/.classpath1
-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.java23
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/.classpath1
5 files changed, 0 insertions, 68 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 5524d06dd..7826b0891 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,10 +13,8 @@ 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;
/**
*
@@ -102,24 +100,4 @@ 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/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.classpath b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.classpath
index 64c5e31b7..c83506765 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.classpath
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.classpath
@@ -2,6 +2,5 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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 df118407e..cc74014e6 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,7 +23,6 @@ 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;
@@ -218,25 +217,5 @@ public class OSGiPlatformAbstraction implements PlatformAbstraction,
log(null, level, message, t);
}
- 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 Logger getLogger(String name) {
- 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 cb08e04fa..3bdf952e9 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,11 +14,9 @@ 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;
/**
@@ -183,25 +181,4 @@ public class LogTracker extends ServiceTracker implements LogService {
return buffer;
}
- 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/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/.classpath b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/.classpath
index 64c5e31b7..c83506765 100644
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/.classpath
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/.classpath
@@ -2,6 +2,5 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Back to the top