diff options
-rw-r--r-- | examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java | 5 | ||||
-rw-r--r-- | framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java | 5 | ||||
-rw-r--r-- | providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath | 2 | ||||
-rw-r--r-- | providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | providers/bundles/org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar (renamed from providers/bundles/org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.2.jar) | bin | 85669 -> 85684 bytes | |||
-rw-r--r-- | providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java | 12 |
6 files changed, 2 insertions, 24 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java index cac8ad863..a9fd3b83a 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java @@ -97,11 +97,6 @@ public class DiscoveryStartup { // do it action.run(null); } - public static void unregisterServerType() { - if (discovery != null) { - discovery.unregisterAllServices(); - } - } public static void registerService(URI uri) { if (discovery != null) { try { diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java index 1559119c6..6f0254525 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java @@ -104,11 +104,6 @@ public interface IDiscoveryContainer { */ public void unregisterService(IServiceInfo serviceInfo); /** - * Unregister all services - * - */ - public void unregisterAllServices(); - /** * Get service info about all known services of given service type * * @param type the ServiceID defining the type of service we are interested in getting diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath b/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath index 10ec528b9..0c8ba300f 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="lib/jmdns-1.0.2.jar"/> + <classpathentry exported="true" sourcepath="/jmdns-1.0" kind="lib" path="lib/jmdns-1.0.3.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF index 0b310af4f..5239f8eec 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF @@ -11,4 +11,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ecf.discovery Eclipse-AutoStart: true Bundle-ClassPath: jmdns.jar, - lib/jmdns-1.0.2.jar + lib/jmdns-1.0.3.jar diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.2.jar b/providers/bundles/org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar Binary files differindex aa77c3095..271547215 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.2.jar +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/lib/jmdns-1.0.3.jar diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java index 51dfcc6e7..6a787ce78 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java @@ -459,18 +459,6 @@ public class JMDNSDiscoveryContainer implements IContainer, } } } - - public void unregisterAllServices() { - synchronized (lock) { - if (jmdns != null) { - if (trace != null) { - trace.msg("unregistering all services"); - } - jmdns.unregisterAllServices(); - } - } - } - public void unregisterService(IServiceInfo serviceInfo) { synchronized (lock) { if (jmdns != null) { |