NEW - bug 254832: [Discovery][SLP] Provider may cache discovered services for lifetime

https://bugs.eclipse.org/bugs/show_bug.cgi?id=254832
NEW - bug 257861: Split org.eclipse.ecf.discovery.IDiscoveryContainerAdapter into "Locator" and a "Advertiser"
https://bugs.eclipse.org/bugs/show_bug.cgi?id=257861

2 files changed, 14 insertions, 1 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/plugin.xml b/providers/bundles/org.eclipse.ecf.provider.jmdns/plugin.xml
index d232114f8..1c16d8892 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/plugin.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/plugin.xml
@@ -9,6 +9,16 @@
             name="ecf.discovery.jmdns"
             server="true">
        </containerFactory>
+      <containerFactory
+            class="org.eclipse.ecf.provider.jmdns.container.ContainerInstantiator"
+            description="Discovery Container Locator"
+            name="ecf.discovery.jmdns.locator">
+      </containerFactory>
+      <containerFactory
+            class="org.eclipse.ecf.provider.jmdns.container.ContainerInstantiator"
+            description="Discovery Container Advertiser"
+            name="ecf.discovery.jmdns.advertiser">
+      </containerFactory>
    </extension>
    <extension
          point="org.eclipse.ecf.identity.namespace">
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java
index dea4fabfe..0c7926ac9 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java
@@ -17,6 +17,8 @@ import org.eclipse.ecf.core.ContainerConnectException;
 import org.eclipse.ecf.core.identity.IDCreateException;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.util.*;
+import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
+import org.eclipse.ecf.discovery.IDiscoveryLocator;
 import org.eclipse.ecf.discovery.service.IDiscoveryService;
 import org.eclipse.ecf.provider.jmdns.container.JMDNSDiscoveryContainer;
 import org.osgi.framework.*;
@@ -79,7 +81,8 @@ public class JMDNSPlugin implements BundleActivator {
 		props.put(IDiscoveryService.CONTAINER_ID, IDFactory.getDefault().createStringID("org.eclipse.ecf.provider.jmdns.container.JMDNSDiscoveryContainer")); //$NON-NLS-1$
 		props.put(IDiscoveryService.CONTAINER_NAME, NAME);
 		props.put(Constants.SERVICE_RANKING, Integer.toString(750));
-		context.registerService(IDiscoveryService.class.getName(), new ServiceFactory() {
+		String[] clazzes = new String[] {IDiscoveryService.class.getName(), IDiscoveryLocator.class.getName(), IDiscoveryAdvertiser.class.getName()};
+		context.registerService(clazzes, new ServiceFactory() {
 			private volatile JMDNSDiscoveryContainer jdc;
 
 			/* (non-Javadoc)