rsa test changes

4 files changed, 14 insertions, 19 deletions

diff --git a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Discovery.java b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Discovery.java
index b918c3c9c..458a377f2 100644
--- a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Discovery.java
+++ b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Discovery.java
@@ -343,6 +343,7 @@ public class Discovery {
 

 	Collection<org.osgi.service.remoteserviceadmin.EndpointDescription> getAllDiscoveredEndpointDescriptions() {

 		Collection<org.osgi.service.remoteserviceadmin.EndpointDescription> result = new ArrayList();

+		if (localLocatorServiceListener == null) return result;

 		// Get local first

 		result.addAll(localLocatorServiceListener.getEndpointDescriptions());

 		synchronized (locatorListeners) {

diff --git a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractRemoteServiceAdmin.java b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractRemoteServiceAdmin.java
index f9f6634ac..7ea73a626 100644
--- a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractRemoteServiceAdmin.java
+++ b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractRemoteServiceAdmin.java
@@ -194,8 +194,8 @@ public abstract class AbstractRemoteServiceAdmin {
 			IRemoteServiceRegistration rsRegistration,

 			IRemoteServiceContainer rsContainer) {

 

-		// container ID

-		ID containerID = rsRegistration.getContainerID();

+		IContainer container = rsContainer.getContainer();

+		ID containerID = container.getID();

 		

 		Map<String, Object> endpointDescriptionProperties = new TreeMap<String, Object>(

 				String.CASE_INSENSITIVE_ORDER);

@@ -223,10 +223,10 @@ public abstract class AbstractRemoteServiceAdmin {
 		if (serviceIntents != null) endpointDescriptionProperties.put(org.osgi.service.remoteserviceadmin.RemoteConstants.SERVICE_INTENTS, serviceIntents);

 		

 		// REMOTE_INTENTS_SUPPORTED 

-		String[] remoteIntentsSupported = getSupportedIntents(rsContainer.getContainer());

+		String[] remoteIntentsSupported = getSupportedIntents(container);

 		if (remoteIntentsSupported != null) endpointDescriptionProperties.put(org.osgi.service.remoteserviceadmin.RemoteConstants.REMOTE_INTENTS_SUPPORTED, remoteIntentsSupported);

 		// REMOTE_CONFIGS_SUPPORTED

-		String[] remoteConfigsSupported = getSupportedConfigs(rsContainer.getContainer());

+		String[] remoteConfigsSupported = getSupportedConfigs(container);

 		if (remoteConfigsSupported != null) endpointDescriptionProperties.put(org.osgi.service.remoteserviceadmin.RemoteConstants.REMOTE_CONFIGS_SUPPORTED, remoteConfigsSupported);

 		

 		// If connectTarget is set

@@ -250,29 +250,23 @@ public abstract class AbstractRemoteServiceAdmin {
 				serviceReference, properties);

 		

 		// fill out all other properties

-		copyEndpointDescriptionProperties(serviceReference,properties,endpointDescriptionProperties);

-		

-		return new EndpointDescription(endpointDescriptionProperties,

-				containerID.getNamespace().getName(),

-				rsRegistration.getID().getContainerRelativeID(), connectTargetID, idFilter,

-				rsFilter);

-	}

-

-	private void copyEndpointDescriptionProperties(

-			ServiceReference serviceReference, Map<String, Object> properties,

-			Map<String, Object> target) {

 		String[] srKeys = serviceReference.getPropertyKeys();

 		if (srKeys != null) {

 			for(int i=0; i < srKeys.length; i++) {

-				if (!PropertiesUtil.isStandardProperty(srKeys[i])) target.put(srKeys[i], serviceReference.getProperty(srKeys[i]));

+				if (!PropertiesUtil.isStandardProperty(srKeys[i])) endpointDescriptionProperties.put(srKeys[i], serviceReference.getProperty(srKeys[i]));

 			}

 		}

 		for(String key: properties.keySet()) {

-			if (!PropertiesUtil.isStandardProperty(key)) target.put(key, properties.get(key));

+			if (!PropertiesUtil.isStandardProperty(key)) endpointDescriptionProperties.put(key, properties.get(key));

 		}

+		

+		return new EndpointDescription(endpointDescriptionProperties,

+				containerID.getNamespace().getName(),

+				rsRegistration.getID().getContainerRelativeID(), connectTargetID, idFilter,

+				rsFilter);

 	}

 

-	private ContainerTypeDescription getContainerTypeDescription(

+	protected ContainerTypeDescription getContainerTypeDescription(

 			IContainer container) {

 		if (container == null)

 			return null;

diff --git a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java
index 7d90f05cb..e8d89b918 100644
--- a/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java
+++ b/incubation/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManager.java
@@ -115,6 +115,7 @@ public class TopologyManager extends AbstractTopologyManager implements
 		result.put(

 				org.osgi.service.remoteserviceadmin.RemoteConstants.SERVICE_EXPORTED_INTERFACES,

 				exportedInterfaces);

+		if (exportedConfigs != null)

 		result.put(

 				org.osgi.service.remoteserviceadmin.RemoteConstants.SERVICE_EXPORTED_CONFIGS,

 				exportedConfigs);

diff --git a/incubation/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/incubation/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index 7c7a43be5..5ca436286 100644
--- a/incubation/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/incubation/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -24,5 +24,4 @@ Import-Package: org.eclipse.ecf.core,
 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0",
  org.junit;bundle-version="4.8.1",
  org.eclipse.ecf.tests;bundle-version="2.1.0"
-Remote-Service: rsvcs/
 Export-Package: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin