diff options
author | slewis | 2016-06-10 21:02:11 +0000 |
---|---|---|
committer | slewis | 2016-06-10 21:02:11 +0000 |
commit | 36f91f97185b060fbdbd7dc099571cb6d4e58266 (patch) | |
tree | 045ad3374868a19fdd9eeba9a338db736614ee1f /protocols/bundles | |
parent | cb5d485df4567cfa154dcf4ec7faba1516a45f6f (diff) | |
download | org.eclipse.ecf-36f91f97185b060fbdbd7dc099571cb6d4e58266.tar.gz org.eclipse.ecf-36f91f97185b060fbdbd7dc099571cb6d4e58266.tar.xz org.eclipse.ecf-36f91f97185b060fbdbd7dc099571cb6d4e58266.zip |
Change-Id: I7be72b359b2eb9676f5d79798f2c31720a92553c
Diffstat (limited to 'protocols/bundles')
-rw-r--r-- | protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiActivator.java | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF index 5e696b2a6..49f53cfea 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote -Bundle-Version: 1.0.6.RC1_qualifier +Bundle-Version: 1.0.7.RC1_qualifier Bundle-Vendor: %plugin.provider Import-Package: org.objectweb.asm;version="[5.0.1,6.0.0)", org.osgi.framework, diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiActivator.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiActivator.java index 4c8a171cd..fcfdc9f32 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiActivator.java +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiActivator.java @@ -31,7 +31,6 @@ package ch.ethz.iks.r_osgi.impl; import java.util.Dictionary; import java.util.Hashtable; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -49,7 +48,6 @@ import ch.ethz.iks.r_osgi.channels.NetworkChannelFactory; */ public final class RemoteOSGiActivator implements BundleActivator { - private static final boolean DELETE_PROXY_BUNDLES_ON_INIT = new Boolean(System.getProperty("ch.ethz.iks.r_osgi.deleteProxyBundlesOnInit","true")).booleanValue(); /** * the Remote OSGi service instance. */ @@ -87,9 +85,6 @@ public final class RemoteOSGiActivator implements BundleActivator { RemoteOSGiServiceImpl.log = (LogService) context.getService(logRef); } - if (DELETE_PROXY_BUNDLES_ON_INIT) - deleteProxyBundles(context); - if (remoting == null) { // get the instance of RemoteOSGiServiceImpl remoting = new RemoteOSGiServiceImpl(); @@ -112,20 +107,6 @@ public final class RemoteOSGiActivator implements BundleActivator { } } - private void deleteProxyBundles(BundleContext context) { - Bundle[] bundles = context.getBundles(); - 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")) - try { - b.uninstall(); - } catch (Exception e) { - if (RemoteOSGiServiceImpl.log != null) - RemoteOSGiServiceImpl.log.log(LogService.LOG_WARNING, "Could not uninstall proxy bundle name="+bName); - } - } - } /** * called when the bundle is stopped. * |