Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-26 14:20:32 -0400
committerslewis2018-04-26 15:21:20 -0400
commit5313ed37811bfed0c3f5e7ca84da92a3dc3e7278 (patch)
tree1ba8a212987a571f276a52c9001f0616be507782
parenta1153682e7ad8e06b5b76742788e3ca83be5a18a (diff)
downloadorg.eclipse.ecf-5313ed37811bfed0c3f5e7ca84da92a3dc3e7278.tar.gz
org.eclipse.ecf-5313ed37811bfed0c3f5e7ca84da92a3dc3e7278.tar.xz
org.eclipse.ecf-5313ed37811bfed0c3f5e7ca84da92a3dc3e7278.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=534087
This bug is caused by the new classes in OSGi R7 org.osgi.service.log package, and so these changes are dependent on using osgiR7. Change-Id: I0000000000000000000000000000000000000000
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath2
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF5
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml2
-rw-r--r--server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java25
5 files changed, 34 insertions, 11 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath
index 6f3b481ac..64c5e31b7 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
+ <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"/>
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs
index 905debea9..96fd56e7c 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,13 @@
-#Fri Aug 07 15:35:21 PDT 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -17,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -71,4 +70,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF
index 05dc50e86..3d49b2569 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/META-INF/MANIFEST.MF
@@ -3,10 +3,9 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.remoteservice.eventadmin
Automatic-Module-Name: org.eclipse.ecf.remoteservice.eventadmin
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.3.0.qualifier
Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: bundle
Import-Package: org.eclipse.ecf.core.sharedobject,
org.eclipse.ecf.core.sharedobject.events,
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml
index 9c83b6f48..6e82bfa30 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.remoteservice.eventadmin</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 ea9cf0b0c..cb08e04fa 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;
/**
@@ -98,6 +100,7 @@ public class LogTracker extends ServiceTracker implements LogService {
* @param reference
* ServiceReference associated with message or null if none.
*/
+ @SuppressWarnings("deprecation")
protected void noLogService(int level, String message, Throwable throwable,
ServiceReference reference) {
if (out != null) {
@@ -179,4 +182,26 @@ public class LogTracker extends ServiceTracker implements LogService {
buffer.append(value);
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();
+ }
+
+
}

Back to the top