Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-12-04 01:07:00 +0000
committerslewis2016-12-04 01:07:00 +0000
commit1393dca8d7786785aa8679258c38683a4c2c7bcc (patch)
tree7bd3d4b12f107831d07b0fea050f902ba8156466 /providers
parent87a4dd40185dd0744545984c8d76aabd5abbea2f (diff)
downloadorg.eclipse.ecf-1393dca8d7786785aa8679258c38683a4c2c7bcc.tar.gz
org.eclipse.ecf-1393dca8d7786785aa8679258c38683a4c2c7bcc.tar.xz
org.eclipse.ecf-1393dca8d7786785aa8679258c38683a4c2c7bcc.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=507655
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/Activator.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF
index c4efb202b..c42287516 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.r_osgi;singleton:=true
-Bundle-Version: 3.5.500.qualifier
-Import-Package: org.eclipse.ecf.core.util.reflection,
+Bundle-Version: 3.5.600.qualifier
+Import-Package: ch.ethz.iks.r_osgi;version="1.0.1",
+ org.eclipse.ecf.core.util.reflection,
org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0",
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework;version="1.3.0",
@@ -12,8 +13,7 @@ Import-Package: org.eclipse.ecf.core.util.reflection,
Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0",
org.eclipse.ecf.provider,
org.eclipse.ecf.remoteservice;bundle-version="5.0.0",
- org.eclipse.equinox.common,
- ch.ethz.iks.r_osgi.remote
+ org.eclipse.equinox.common
Bundle-Activator: org.eclipse.ecf.internal.provider.r_osgi.Activator
Eclipse-LazyStart: true
Export-Package: org.eclipse.ecf.provider.r_osgi.identity;version="3.2.0"
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml b/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml
index 329f19e26..21f6f3157 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider.r_osgi</artifactId>
- <version>3.5.500-SNAPSHOT</version>
+ <version>3.5.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/Activator.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/Activator.java
index a1362a8d2..fd337c55a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/Activator.java
@@ -95,7 +95,7 @@ public final class Activator implements BundleActivator {
for (int i = 0; i < bundles.length; i++) {
Bundle b = bundles[i];
String bName = b.getSymbolicName();
- if (bName.startsWith("R-OSGi Proxy Bundle generated for Endpoint")) //$NON-NLS-1$
+ if (bName.startsWith(RemoteOSGiService.R_OSGi_PROXY_PREFIX))
try {
b.uninstall();
} catch (Exception e) {

Back to the top