Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-05-14 23:46:44 -0400
committerslewis2018-05-14 23:46:44 -0400
commit61bbda32a81cab934bca838321dc8238cf494aa8 (patch)
tree71faa381dcd58d3d07bc50d0b2b304b35878818d /providers/bundles
parent9a681531f419ffb549870431a52c3b467fe3d032 (diff)
downloadorg.eclipse.ecf-61bbda32a81cab934bca838321dc8238cf494aa8.tar.gz
org.eclipse.ecf-61bbda32a81cab934bca838321dc8238cf494aa8.tar.xz
org.eclipse.ecf-61bbda32a81cab934bca838321dc8238cf494aa8.zip
Fix for bndtools startup limitation.
Diffstat (limited to 'providers/bundles')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF2
-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.java18
3 files changed, 8 insertions, 14 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 21adbe54a..49eb41df9 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
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.r_osgi;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider.r_osgi
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.100.qualifier
Import-Package: ch.ethz.iks.r_osgi;version="[1.0.1,2.0.0)",
org.eclipse.ecf.core.util.reflection,
org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.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 d5eb985cf..e670e4421 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.6.0-SNAPSHOT</version>
+ <version>3.6.100-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 fd337c55a..329cb211c 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
@@ -15,6 +15,7 @@ import ch.ethz.iks.r_osgi.RemoteOSGiService;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.ecf.core.ContainerTypeDescription;
import org.eclipse.ecf.core.identity.Namespace;
+import org.eclipse.ecf.core.util.BundleStarter;
import org.eclipse.ecf.core.util.ExtensionRegistryRunnable;
import org.eclipse.ecf.provider.r_osgi.identity.*;
import org.eclipse.equinox.concurrent.future.IExecutor;
@@ -55,13 +56,6 @@ public final class Activator implements BundleActivator {
private ServiceTracker r_osgi_tracker;
/**
- * The constructor.
- */
- public Activator() {
- plugin = this;
- }
-
- /**
* Called when the OSGi framework starts the bundle.
*
* @param bc
@@ -69,10 +63,13 @@ public final class Activator implements BundleActivator {
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
public void start(final BundleContext bc) throws Exception {
+ plugin = this;
this.context = bc;
+ // start ch.ethz.iks.r_osgi.remote bundle
+ BundleStarter.startDependents(context, new String[] {"ch.ethz.iks.r_osgi.remote"}, Bundle.RESOLVED | Bundle.STARTING); //$NON-NLS-1$
+
r_osgi_tracker = new ServiceTracker(context, RemoteOSGiService.class.getName(), null);
r_osgi_tracker.open();
-
// bug 495535
if (DELETE_PROXY_BUNDLES_ON_INIT)
deleteProxyBundles();
@@ -150,10 +147,7 @@ public final class Activator implements BundleActivator {
*
* @return the shared instance
*/
- public static synchronized Activator getDefault() {
- if (plugin == null) {
- plugin = new Activator();
- }
+ public static Activator getDefault() {
return plugin;
}

Back to the top