From 2a21185f2be654c769ab1b9908ca75280ad47cb2 Mon Sep 17 00:00:00 2001
From: slewis
Date: Wed, 16 May 2018 09:38:31 -0700
Subject: Fix for bndtools-imposed start structure

Change-Id: Ie10123cf3d238dfdc6917f2bb5fbd731a77a52e6
---
 .../META-INF/MANIFEST.MF                                     |  2 +-
 .../org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml |  2 +-
 .../internal/osgi/services/remoteserviceadmin/Activator.java | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 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 585d4e7a3..bb5624e6a 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.500.qualifier
+Bundle-Version: 4.6.600.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/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml
index dea1f0d16..dc0adf92a 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.osgi.services.remoteserviceadmin</artifactId>
-  <version>4.6.500-SNAPSHOT</version>
+  <version>4.6.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
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 a91bbf014..e23cc925f 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
@@ -248,9 +248,15 @@ public class Activator implements BundleActivator {
 		// approach/using the ServiceFactory extender approach for this purpose:
 		// https://mail.osgi.org/pipermail/osgi-dev/2011-February/003000.html
 		initializeProxyServiceFactoryBundle();
+		
+		// Start distribution providers if not already started
+		initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE,
+				"Could not start distribution provider. "); //$NON-NLS-1$
+
 		// make remote service admin available
 		rsaProps = new Properties();
 		rsaProps.put(RemoteServiceAdmin.SERVICE_PROP, new Boolean(true));
+
 		// Register Remote Service Admin factory, with rsaProps
 		remoteServiceAdminRegistration = context.registerService(
 				org.osgi.service.remoteserviceadmin.RemoteServiceAdmin.class.getName(), new ServiceFactory() {
@@ -274,7 +280,8 @@ public class Activator implements BundleActivator {
 						}
 					}
 				}, (Dictionary) rsaProps);
-
+		// Setup tracker for ContainerTypeDescriptions, which will modify the RSA properties when
+		// added/removed by distribution providers
 		ctdTracker = new ServiceTracker<ContainerTypeDescription, ContainerTypeDescription>(context,
 				ContainerTypeDescription.class,
 				new ServiceTrackerCustomizer<ContainerTypeDescription, ContainerTypeDescription>() {
@@ -312,9 +319,6 @@ public class Activator implements BundleActivator {
 				});
 		ctdTracker.open();
 
-		// Start distribution providers if not already started
-		initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE,
-				"Could not start distribution provider. "); //$NON-NLS-1$
 		// create endpoint description locator
 		endpointDescriptionLocator = new EndpointDescriptionLocator(context);
 		// create and register endpoint description advertiser
-- 
cgit v1.2.3