Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-04-20 21:45:36 +0000
committerslewis2007-04-20 21:45:36 +0000
commit2a9da06071a6e41dd8996caead8b8e63dc1c5843 (patch)
tree99b008fe82882c9bcccb64f63ecf6aeb55d3206f /framework/bundles/org.eclipse.ecf.remoteservice
parenta8257b77d80e67f424c9b853c966df6827cbfdad (diff)
downloadorg.eclipse.ecf-2a9da06071a6e41dd8996caead8b8e63dc1c5843.tar.gz
org.eclipse.ecf-2a9da06071a6e41dd8996caead8b8e63dc1c5843.tar.xz
org.eclipse.ecf-2a9da06071a6e41dd8996caead8b8e63dc1c5843.zip
update to manifests and .classpath files for jre and cdc/foundation version
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.remoteservice')
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/.classpath2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF4
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteServiceTracker.java6
4 files changed, 12 insertions, 7 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.classpath b/framework/bundles/org.eclipse.ecf.remoteservice/.classpath
index ce0c7a5d4..36e946365 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/.classpath
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs
index b42fbe1c2..b0ebcce8b 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,16 @@
-#Sat Mar 10 21:05:52 PST 2007
+#Fri Apr 20 14:38:45 GMT-08:00 2007
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.compliance=1.3
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -51,3 +55,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
index 29a6e787e..e882066d6 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Export-Package: org.eclipse.ecf.internal.remoteservice;x-internal:=true,
org.eclipse.ecf.remoteservice.events,
org.eclipse.ecf.remoteservice.service,
org.eclipse.ecf.remoteservice.util
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
+Bundle-RequiredExecutionEnvironment: J2SE-1.3,
+ CDC-1.0/Foundation-1.0
Require-Bundle: org.eclipse.equinox.common,
org.eclipse.ecf
Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteServiceTracker.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteServiceTracker.java
index 806744375..c12f594e4 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteServiceTracker.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteServiceTracker.java
@@ -61,19 +61,19 @@ public class RemoteServiceTracker implements IRemoteServiceTrackerCustomizer {
*
* This field is volatile since it is accessed by multiple threads.
*/
- private volatile int trackingCount = -1;
+ //private volatile int trackingCount = -1;
/**
* Cached ServiceReference for getServiceReference.
*
* This field is volatile since it is accessed by multiple threads.
*/
- private volatile IRemoteServiceReference cachedReference;
+ //private volatile IRemoteServiceReference cachedReference;
/**
* Cached service object for getService.
*
* This field is volatile since it is accessed by multiple threads.
*/
- private volatile Object cachedService;
+ //private volatile Object cachedService;
/**
* Inner class to track services. If a <code>ServiceTracker</code> object

Back to the top