From 29503eed5fa473b5e78d3881b5480ac79c2b55c4 Mon Sep 17 00:00:00 2001
From: slewis
Date: Tue, 27 Feb 2018 15:46:08 -0800
Subject: Added start of discovery providers to RSA impl

Change-Id: I3922a46dfbc43547ec379f4d7dddbe93930b593b
---
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../services/remoteserviceadmin/Activator.java     | 27 +++++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'osgi')

diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index 92a729eb3..06da45e87 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin
 Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin
-Bundle-Version: 4.6.100.qualifier
+Bundle-Version: 4.6.200.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.osgi.services.remoteserviceadmin.Activator
 Bundle-Vendor: %bundle.provider
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
index a65e40067..8b64ca40c 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
@@ -48,6 +48,7 @@ import org.osgi.resource.Capability;
 import org.osgi.service.log.LogService;
 import org.osgi.service.remoteserviceadmin.ExportRegistration;
 import org.osgi.service.remoteserviceadmin.ImportRegistration;
+import org.osgi.service.remoteserviceadmin.namespace.DiscoveryNamespace;
 import org.osgi.service.remoteserviceadmin.namespace.DistributionNamespace;
 import org.osgi.util.tracker.ServiceTracker;
 import org.osgi.util.tracker.ServiceTrackerCustomizer;
@@ -111,20 +112,21 @@ public class Activator implements BundleActivator {
 					+ RSA_PROXY_BUNDLE_SYMBOLIC_ID + "') cannot be found, so RSA cannot be started"); //$NON-NLS-1$
 	}
 
-	private void initializeDistributionProviders() {
+	private void initializeProviders(Bundle hostBundle, String namespace, String startErrorMessage) {
 		for (final Bundle b : context.getBundles()) {
 			BundleRevision rb = AccessController.doPrivileged(new PrivilegedAction<BundleRevision>() {
 				public BundleRevision run() {
 					return b.adapt(BundleRevision.class);
 				}
 			});
-			List<Capability> capabilities = rb.getCapabilities(DistributionNamespace.DISTRIBUTION_NAMESPACE);
-			if (capabilities != null && capabilities.size() > 0)
+			List<Capability> capabilities = rb.getCapabilities(namespace);
+			if (capabilities != null && capabilities.size() > 0
+					&& !b.getSymbolicName().equals(hostBundle.getSymbolicName()))
 				try {
 					b.start();
 				} catch (BundleException e) {
-					LogUtility.logError("RemoteServiceAdmin.initializeDistributionProviders", DebugOptions.REMOTE_SERVICE_ADMIN, //$NON-NLS-1$
-							Activator.class, "Cannot start distribution provider bundle=" + b.getSymbolicName(), e); //$NON-NLS-1$
+					LogUtility.logError("RemoteServiceAdmin.initializeProviders", DebugOptions.REMOTE_SERVICE_ADMIN, //$NON-NLS-1$
+							Activator.class, startErrorMessage + " bundle=" + b.getSymbolicName(), e); //$NON-NLS-1$
 				}
 		}
 	}
@@ -221,8 +223,8 @@ public class Activator implements BundleActivator {
 		try {
 			BundleStarter.startDependents(context, DEPENDENT_BUNDLES, Bundle.RESOLVED | Bundle.STARTING);
 		} catch (BundleException e) {
-			LogUtility.logError("RemoteServiceAdmin.initializeDependents", DebugOptions.REMOTE_SERVICE_ADMIN, this.getClass(), //$NON-NLS-1$
-					"Cannot start RSA dependent bundle", e); //$NON-NLS-1$
+			LogUtility.logError("RemoteServiceAdmin.initializeDependents", DebugOptions.REMOTE_SERVICE_ADMIN, //$NON-NLS-1$
+					this.getClass(), "Cannot start RSA dependent bundle", e); //$NON-NLS-1$
 		}
 	}
 
@@ -230,8 +232,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
-	 * )
+	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext )
 	 */
 	public void start(BundleContext bundleContext) throws Exception {
 		Activator.context = bundleContext;
@@ -248,7 +249,11 @@ public class Activator implements BundleActivator {
 		// https://mail.osgi.org/pipermail/osgi-dev/2011-February/003000.html
 		initializeProxyServiceFactoryBundle();
 		// Start distribution providers if not already started
-		initializeDistributionProviders();
+		initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE,
+				"Could not start distribution provider. "); //$NON-NLS-1$
+		// Start distribution providers if not already started
+		initializeProviders(context.getBundle(), DiscoveryNamespace.DISCOVERY_NAMESPACE,
+				"Could not start discovery provider. "); //$NON-NLS-1$
 		// make remote service admin available
 		rsaProps = new Properties();
 		rsaProps.put(RemoteServiceAdmin.SERVICE_PROP, new Boolean(true));
@@ -362,7 +367,7 @@ public class Activator implements BundleActivator {
 			}
 		}
 		stopProxyServiceFactoryBundle();
-		
+
 		synchronized (importedRegistrations) {
 			if (importedRegistrations != null) {
 				importedRegistrations.clear();
-- 
cgit v1.2.3