Further additions, simplications, documentation.

3 files changed, 15 insertions, 6 deletions

diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/DiscoveredServiceNotificationImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/DiscoveredServiceNotificationImpl.java
index 5e2f2f37a..014db1552 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/DiscoveredServiceNotificationImpl.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/DiscoveredServiceNotificationImpl.java
@@ -9,6 +9,8 @@
  ******************************************************************************/
 package org.eclipse.ecf.internal.osgi.services.discovery;
 
+import org.eclipse.ecf.osgi.services.discovery.ServiceEndpointDescriptionImpl;
+
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.discovery.IServiceInfo;
 import org.osgi.service.discovery.DiscoveredServiceNotification;
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServicePublication.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServicePublication.java
index ed2079bda..077e5393b 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServicePublication.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ECFServicePublication.java
@@ -13,7 +13,6 @@ import org.osgi.service.discovery.ServicePublication;
 
 public interface ECFServicePublication extends ServicePublication {
 
-	public static final String DISCOVERY_CONTAINER_ID_PROP = "ecf.sp.container.id";
 	public static final String SERVICE_TYPE = "osgiservices";
 	public static final String DEFAULT_SERVICE_NAME_PREFIX = "service.";
 
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ServiceEndpointDescriptionImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ServiceEndpointDescriptionImpl.java
index cfa6a6762..d5bfea0f9 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ServiceEndpointDescriptionImpl.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/ServiceEndpointDescriptionImpl.java
@@ -7,7 +7,7 @@
  * Contributors:
  *   EclipseSource - initial API and implementation
  ******************************************************************************/
-package org.eclipse.ecf.internal.osgi.services.discovery;
+package org.eclipse.ecf.osgi.services.discovery;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -15,21 +15,29 @@ import java.util.*;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.discovery.IServiceInfo;
 import org.eclipse.ecf.discovery.IServiceProperties;
-import org.eclipse.ecf.osgi.services.discovery.ECFServicePublication;
+import org.eclipse.ecf.discovery.identity.IServiceID;
+import org.eclipse.ecf.internal.osgi.services.discovery.ServicePropertyUtils;
 import org.osgi.service.discovery.ServiceEndpointDescription;
 import org.osgi.service.discovery.ServicePublication;
 
 public class ServiceEndpointDescriptionImpl implements
 		ServiceEndpointDescription {
 
+	private final ID discoveryContainerID;
 	private final IServiceInfo serviceInfo;
 
 	public ServiceEndpointDescriptionImpl(ID localContainerID,
 			IServiceInfo serviceInfo) {
+		this.discoveryContainerID = localContainerID;
 		this.serviceInfo = serviceInfo;
-		// add localContainerID to set of service properties exposed by this
-		this.serviceInfo.getServiceProperties().setProperty(
-				ECFServicePublication.DISCOVERY_CONTAINER_ID_PROP, localContainerID);
+	}
+
+	public ID getDiscoveryContainerID() {
+		return discoveryContainerID;
+	}
+
+	public IServiceID getServiceID() {
+		return this.serviceInfo.getServiceID();
 	}
 
 	public String getEndpointID() {