Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-09-05 23:29:28 +0000
committerslewis2007-09-05 23:29:28 +0000
commit54bb449e7ced2b30e4b0d0cfe3f5618674a9e81a (patch)
treee030d32446c3247029587f5365e79615962e0b66 /examples/bundles/org.eclipse.ecf.example.collab
parent787d4d6a467c2e5718297f1c3481047554052576 (diff)
downloadorg.eclipse.ecf-54bb449e7ced2b30e4b0d0cfe3f5618674a9e81a.tar.gz
org.eclipse.ecf-54bb449e7ced2b30e4b0d0cfe3f5618674a9e81a.tar.xz
org.eclipse.ecf-54bb449e7ced2b30e4b0d0cfe3f5618674a9e81a.zip
Changes to discovery API and implementations as per bug 200791 and bug 202036
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.example.collab')
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/DiscoveryStartup.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/DiscoveryStartup.java
index 20925ee8c..0551b9dea 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/DiscoveryStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/DiscoveryStartup.java
@@ -19,13 +19,15 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.ecf.core.ContainerCreateException;
import org.eclipse.ecf.core.ContainerFactory;
import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.core.identity.IDFactory;
+import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer;
import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
import org.eclipse.ecf.discovery.IServiceInfo;
import org.eclipse.ecf.discovery.IServiceProperties;
import org.eclipse.ecf.discovery.ServiceInfo;
import org.eclipse.ecf.discovery.ServiceProperties;
-import org.eclipse.ecf.discovery.identity.ServiceID;
+import org.eclipse.ecf.discovery.identity.IServiceID;
import org.eclipse.ecf.internal.example.collab.actions.URIClientConnectAction;
public class DiscoveryStartup {
@@ -130,8 +132,10 @@ public class DiscoveryStartup {
int port = uri.getPort();
String svcName = System.getProperty("user.name") + "."
+ protocol;
- ServiceInfo svcInfo = new ServiceInfo(host, new ServiceID(
- ClientPlugin.TCPSERVER_DISCOVERY_TYPE, svcName), port,
+ Namespace namespace = IDFactory.getDefault().getNamespaceByName("zeroconf.jmdns");
+ IServiceID srvID = (IServiceID) namespace.createInstance(new String[]{ClientPlugin.TCPSERVER_DISCOVERY_TYPE, svcName});
+
+ ServiceInfo svcInfo = new ServiceInfo(host, srvID, port,
SVC_DEF_PRIORITY, SVC_DEF_WEIGHT,
new ServiceProperties(props));
discovery.registerService(svcInfo);

Back to the top